summaryrefslogtreecommitdiffstats
path: root/debian/_base
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_base')
-rw-r--r--debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kdbg/debian/compat2
-rw-r--r--debian/_base/applications/development/kdbg/debian/control2
-rw-r--r--debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kdiff3/debian/compat2
-rw-r--r--debian/_base/applications/development/kdiff3/debian/control2
-rw-r--r--debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kpicosim/debian/compat2
-rw-r--r--debian/_base/applications/development/kpicosim/debian/control2
-rw-r--r--debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kscope/debian/compat2
-rw-r--r--debian/_base/applications/development/kscope/debian/control2
-rw-r--r--debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/ktechlab/debian/compat2
-rw-r--r--debian/_base/applications/development/ktechlab/debian/control2
-rw-r--r--debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kxmleditor/debian/compat2
-rw-r--r--debian/_base/applications/development/kxmleditor/debian/control2
-rw-r--r--debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/piklab/debian/compat2
-rw-r--r--debian/_base/applications/development/piklab/debian/control2
-rw-r--r--debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/tdesvn/debian/compat2
-rw-r--r--debian/_base/applications/development/tdesvn/debian/control2
-rw-r--r--debian/_base/applications/development/tdesvn/debian/docs3
-rw-r--r--debian/_base/applications/development/tdesvn/debian/man/tdesvn.1171
-rw-r--r--debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1145
-rwxr-xr-xdebian/_base/applications/development/tdesvn/debian/rules1
-rw-r--r--debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install2
-rw-r--r--debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages2
-rw-r--r--debian/_base/applications/development/tdesvn/debian/watch2
-rw-r--r--debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/games/knights/debian/compat2
-rw-r--r--debian/_base/applications/games/knights/debian/control2
-rw-r--r--debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/games/tdepacman/debian/compat2
-rw-r--r--debian/_base/applications/games/tdepacman/debian/control2
-rw-r--r--debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/graphics/digikam/debian/compat2
-rw-r--r--debian/_base/applications/graphics/digikam/debian/control2
-rw-r--r--debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/graphics/gwenview-i18n/debian/compat2
-rw-r--r--debian/_base/applications/graphics/gwenview-i18n/debian/control6
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/compat2
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/control10
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base9
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/gwenview.lintian3
-rw-r--r--debian/_base/applications/graphics/gwenview/debian/gwenview.xpm554
-rwxr-xr-xdebian/_base/applications/graphics/gwenview/debian/rules55
-rw-r--r--debian/_base/applications/graphics/ksquirrel/debian/compat2
-rw-r--r--debian/_base/applications/graphics/ksquirrel/debian/control2
-rw-r--r--debian/_base/applications/graphics/ksquirrel/debian/docs2
-rw-r--r--debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.122
-rwxr-xr-xdebian/_base/applications/graphics/ksquirrel/debian/rules6
-rw-r--r--debian/_base/applications/graphics/ksquirrel/debian/watch6
-rw-r--r--debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/graphics/potracegui/debian/compat2
-rw-r--r--debian/_base/applications/graphics/potracegui/debian/control2
-rw-r--r--debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kasablanca/debian/compat2
-rw-r--r--debian/_base/applications/internet/kasablanca/debian/control2
-rw-r--r--debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kbiff/debian/compat2
-rw-r--r--debian/_base/applications/internet/kbiff/debian/control2
-rw-r--r--debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kftpgrabber/debian/compat2
-rw-r--r--debian/_base/applications/internet/kftpgrabber/debian/control2
-rw-r--r--debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/knmap/debian/compat2
-rw-r--r--debian/_base/applications/internet/knmap/debian/control2
-rw-r--r--debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/konversation/debian/compat2
-rw-r--r--debian/_base/applications/internet/konversation/debian/control6
-rw-r--r--debian/_base/applications/internet/konversation/debian/konversation-trinity.docs2
-rw-r--r--debian/_base/applications/internet/konversation/debian/konversation-trinity.install10
-rw-r--r--debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages1
-rw-r--r--debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook214
-rw-r--r--debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook95
-rwxr-xr-xdebian/_base/applications/internet/konversation/debian/rules16
-rw-r--r--debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kopete-otr/debian/compat2
-rw-r--r--debian/_base/applications/internet/kopete-otr/debian/control2
-rw-r--r--debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kshowmail/debian/compat2
-rw-r--r--debian/_base/applications/internet/kshowmail/debian/control2
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/compat2
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/control2
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/dirs3
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst14
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm19
-rw-r--r--debian/_base/applications/internet/kstreamripper/debian/kstreamripper.132
-rw-r--r--debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/ktorrent/debian/compat2
-rw-r--r--debian/_base/applications/internet/ktorrent/debian/control2
-rw-r--r--debian/_base/applications/internet/kvirc/debian/compat2
-rw-r--r--debian/_base/applications/internet/kvirc/debian/control2
-rwxr-xr-xdebian/_base/applications/internet/kvirc/debian/rules2
-rw-r--r--debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/kvpnc/debian/compat2
-rw-r--r--debian/_base/applications/internet/kvpnc/debian/control2
-rw-r--r--debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/smb4k/debian/compat2
-rw-r--r--debian/_base/applications/internet/smb4k/debian/control2
-rw-r--r--debian/_base/applications/internet/smb4k/debian/patches/series (renamed from debian/_base/applications/misc/fusion-icon/debian/patches/series)0
-rwxr-xr-xdebian/_base/applications/internet/smb4k/debian/rules40
-rw-r--r--debian/_base/applications/internet/smb4k/debian/watch6
-rw-r--r--debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/internet/tork/debian/compat2
-rw-r--r--debian/_base/applications/internet/tork/debian/control2
-rw-r--r--debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/bibletime/debian/compat2
-rw-r--r--debian/_base/applications/misc/bibletime/debian/control2
-rw-r--r--debian/_base/applications/misc/bibletime/debian/de/bibletime.1109
-rw-r--r--debian/_base/applications/misc/bibletime/debian/docs1
-rw-r--r--debian/_base/applications/misc/bibletime/debian/en/bibletime.1109
-rw-r--r--debian/_base/applications/misc/bibletime/debian/install4
-rwxr-xr-xdebian/_base/applications/misc/bibletime/debian/rules30
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat2
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control2
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl (renamed from debian/_base/common/cmake/debian/cdbs/versions.pl)0
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/compat2
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/control8
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install8
-rwxr-xr-xdebian/_base/applications/misc/desktop-effects-tde/debian/rules34
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/changelog76
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/compat1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/control23
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/copyright31
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/fusion-icon.138
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm359
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/install1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/links1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/manpages1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/menu2
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/pycompat1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk260
-rwxr-xr-xdebian/_base/applications/misc/fusion-icon/debian/rules51
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/control2
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/control2
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/control2
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/compat2
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/control2
-rw-r--r--debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/krecipes/debian/compat2
-rw-r--r--debian/_base/applications/misc/krecipes/debian/control2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/control12
-rwxr-xr-xdebian/_base/applications/multimedia/amarok/debian/rules6
-rw-r--r--debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/codeine/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/codeine/debian/control2
-rw-r--r--debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/k3b-i18n/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/k3b-i18n/debian/control2
-rw-r--r--debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/k3b/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/k3b/debian/control2
-rw-r--r--debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/k9copy/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/k9copy/debian/control3
-rwxr-xr-xdebian/_base/applications/multimedia/k9copy/debian/rules37
-rw-r--r--debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/kaffeine-mozilla/debian/control2
-rw-r--r--debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/kaffeine/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/kaffeine/debian/control2
-rw-r--r--debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/kmplayer/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/kmplayer/debian/control2
-rw-r--r--debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/kplayer/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/kplayer/debian/control2
-rw-r--r--debian/_base/applications/multimedia/kplayer/debian/docs3
-rw-r--r--debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/mplayerthumbs/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/mplayerthumbs/debian/control2
-rw-r--r--debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/rosegarden/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/rosegarden/debian/control2
-rwxr-xr-xdebian/_base/applications/multimedia/rosegarden/debian/rules2
-rw-r--r--debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/soundkonverter/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/soundkonverter/debian/control2
-rw-r--r--debian/_base/applications/multimedia/soundkonverter/debian/patches/series (renamed from debian/_base/common/cmake/debian/patches/series)0
-rwxr-xr-xdebian/_base/applications/multimedia/soundkonverter/debian/rules45
-rw-r--r--debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install14
-rw-r--r--debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/multimedia/tderadio/debian/compat2
-rw-r--r--debian/_base/applications/multimedia/tderadio/debian/control4
-rw-r--r--debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/basket/debian/compat2
-rw-r--r--debian/_base/applications/office/basket/debian/control2
-rw-r--r--debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/kbibtex/debian/compat2
-rw-r--r--debian/_base/applications/office/kbibtex/debian/control2
-rw-r--r--debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/kbookreader/debian/compat2
-rw-r--r--debian/_base/applications/office/kbookreader/debian/control2
-rw-r--r--debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/keximdb/debian/compat2
-rw-r--r--debian/_base/applications/office/keximdb/debian/control2
-rw-r--r--debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/kile/debian/compat2
-rw-r--r--debian/_base/applications/office/kile/debian/control2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/README.source6
-rw-r--r--debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/kmymoney/debian/compat2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/control2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs2
-rw-r--r--debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/knowit/debian/compat2
-rw-r--r--debian/_base/applications/office/knowit/debian/control2
-rw-r--r--debian/_base/applications/office/koffice-i18n/debian/compat2
-rw-r--r--debian/_base/applications/office/koffice-i18n/debian/control396
-rw-r--r--debian/_base/applications/office/koffice-i18n/debian/control-lang10
-rw-r--r--debian/_base/applications/office/koffice-i18n/debian/control-source6
-rw-r--r--debian/_base/applications/office/koffice-i18n/debian/debiandirs10
-rwxr-xr-xdebian/_base/applications/office/koffice-i18n/debian/rules190
-rw-r--r--debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/koffice/debian/compat2
-rw-r--r--debian/_base/applications/office/koffice/debian/control4
-rw-r--r--debian/_base/applications/office/koffice/debian/kformula-trinity.lintian2
-rw-r--r--debian/_base/applications/office/koffice/debian/koshell-trinity.lintian2
-rw-r--r--debian/_base/applications/office/koffice/debian/kplato-trinity.lintian2
-rw-r--r--debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian3
-rwxr-xr-xdebian/_base/applications/office/koffice/debian/rules2
-rw-r--r--debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/kpilot/debian/compat2
-rw-r--r--debian/_base/applications/office/kpilot/debian/control2
-rw-r--r--debian/_base/applications/office/kpilot/debian/docs4
-rw-r--r--debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/office/tellico/debian/compat2
-rw-r--r--debian/_base/applications/office/tellico/debian/control11
-rwxr-xr-xdebian/_base/applications/office/tellico/debian/rules4
-rw-r--r--debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/kdpkg/debian/compat2
-rw-r--r--debian/_base/applications/settings/kdpkg/debian/control2
-rw-r--r--debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/kima/debian/compat2
-rw-r--r--debian/_base/applications/settings/kima/debian/control2
-rw-r--r--debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/kiosktool/debian/compat2
-rw-r--r--debian/_base/applications/settings/kiosktool/debian/control2
-rw-r--r--debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/kkbswitch/debian/compat2
-rw-r--r--debian/_base/applications/settings/kkbswitch/debian/control2
-rw-r--r--debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/klcddimmer/debian/compat2
-rw-r--r--debian/_base/applications/settings/klcddimmer/debian/control2
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/compat2
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/control2
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/debiandirs10
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/install1
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1162
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/manpages1
-rwxr-xr-xdebian/_base/applications/settings/kmyfirewall/debian/rules1
-rw-r--r--debian/_base/applications/settings/kmyfirewall/debian/watch2
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/README.Debian107
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk246
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/compat2
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/control17
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/docs2
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs3
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install4
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.169
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/pycompat1
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk297
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/pyversions1
-rwxr-xr-xdebian/_base/applications/settings/tde-guidance/debian/rules181
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.169
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs3
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install84
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides2
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst9
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.169
-rw-r--r--debian/_base/applications/settings/tde-guidance/debian/watch2
-rw-r--r--debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/tde-systemsettings/debian/compat2
-rw-r--r--debian/_base/applications/settings/tde-systemsettings/debian/control2
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/compat2
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/control4
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian2
-rw-r--r--debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst12
-rw-r--r--debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/tdesudo/debian/compat2
-rw-r--r--debian/_base/applications/settings/tdesudo/debian/control2
-rw-r--r--debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/settings/wlassistant/debian/compat2
-rw-r--r--debian/_base/applications/settings/wlassistant/debian/control2
-rw-r--r--debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/dolphin/debian/compat2
-rw-r--r--debian/_base/applications/system/dolphin/debian/control2
-rw-r--r--debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/katapult/debian/compat2
-rw-r--r--debian/_base/applications/system/katapult/debian/control2
-rw-r--r--debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kbfx/debian/compat2
-rw-r--r--debian/_base/applications/system/kbfx/debian/control2
-rw-r--r--debian/_base/applications/system/kbfx/debian/postinst25
-rw-r--r--debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kcmautostart/debian/compat2
-rw-r--r--debian/_base/applications/system/kcmautostart/debian/control2
-rw-r--r--debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kdbusnotification/debian/compat2
-rw-r--r--debian/_base/applications/system/kdbusnotification/debian/control2
-rw-r--r--debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/klamav/debian/compat2
-rw-r--r--debian/_base/applications/system/klamav/debian/control2
-rw-r--r--debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/knemo/debian/compat2
-rw-r--r--debian/_base/applications/system/knemo/debian/control2
-rw-r--r--debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/knetload/debian/compat2
-rw-r--r--debian/_base/applications/system/knetload/debian/control2
-rw-r--r--debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/knetstats/debian/compat2
-rw-r--r--debian/_base/applications/system/knetstats/debian/control2
-rw-r--r--debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kooldock/debian/compat2
-rw-r--r--debian/_base/applications/system/kooldock/debian/control2
-rw-r--r--debian/_base/applications/system/kooldock/debian/docs3
-rw-r--r--debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/krusader/debian/compat2
-rw-r--r--debian/_base/applications/system/krusader/debian/control2
-rw-r--r--debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kshutdown/debian/compat2
-rw-r--r--debian/_base/applications/system/kshutdown/debian/control2
-rw-r--r--debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/ksystemlog/debian/compat2
-rw-r--r--debian/_base/applications/system/ksystemlog/debian/control2
-rw-r--r--debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/kvkbd/debian/compat2
-rw-r--r--debian/_base/applications/system/kvkbd/debian/control2
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/compat2
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/control2
-rw-r--r--debian/_base/applications/system/smartcardauth/debian/compat2
-rw-r--r--debian/_base/applications/system/smartcardauth/debian/control2
-rw-r--r--debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/tastymenu/debian/compat2
-rw-r--r--debian/_base/applications/system/tastymenu/debian/control2
-rw-r--r--debian/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/system/tdebluez/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/system/tdebluez/debian/changelog12
-rw-r--r--debian/_base/applications/system/tdebluez/debian/compat1
-rw-r--r--debian/_base/applications/system/tdebluez/debian/control76
-rw-r--r--debian/_base/applications/system/tdebluez/debian/copyright43
-rw-r--r--debian/_base/applications/system/tdebluez/debian/docs1
-rw-r--r--debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install3
-rw-r--r--debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install2
-rw-r--r--debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install3
-rw-r--r--debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install2
-rwxr-xr-xdebian/_base/applications/system/tdebluez/debian/rules19
-rw-r--r--debian/_base/applications/system/tdebluez/debian/source/format (renamed from debian/_base/applications/misc/fusion-icon/debian/source/format)0
-rw-r--r--debian/_base/applications/system/tdebluez/debian/source/options (renamed from debian/_base/applications/misc/fusion-icon/debian/source/options)0
-rw-r--r--debian/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install1
-rw-r--r--debian/_base/applications/system/tdebluez/debian/tdebluez-trinity.install27
-rw-r--r--debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/tdedocker/debian/compat2
-rw-r--r--debian/_base/applications/system/tdedocker/debian/control2
-rw-r--r--debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/tdepowersave/debian/compat2
-rw-r--r--debian/_base/applications/system/tdepowersave/debian/control2
-rw-r--r--debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian2
-rw-r--r--debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst13
-rw-r--r--debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk18
-rw-r--r--debian/_base/applications/system/tdesshaskpass/debian/compat2
-rw-r--r--debian/_base/applications/system/tdesshaskpass/debian/control2
-rw-r--r--debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/system/yakuake/debian/compat2
-rw-r--r--debian/_base/applications/system/yakuake/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-apt/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-apt/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-ftps/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-ftps/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-gopher/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-gopher/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-locate/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-locate/debian/control2
-rwxr-xr-xdebian/_base/applications/tdeio/tdeio-locate/debian/rules22
-rw-r--r--debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-sword/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-sword/debian/control2
-rw-r--r--debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat2
-rw-r--r--debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control2
-rw-r--r--debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/gtk-qt-engine/debian/compat2
-rw-r--r--debian/_base/applications/themes/gtk-qt-engine/debian/control2
-rw-r--r--debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/gtk3-tqt-engine/debian/compat2
-rw-r--r--debian/_base/applications/themes/gtk3-tqt-engine/debian/control2
-rw-r--r--debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/kgtk-qt3/debian/compat2
-rw-r--r--debian/_base/applications/themes/kgtk-qt3/debian/control2
-rw-r--r--debian/_base/applications/themes/kgtk-qt3/debian/docs2
-rw-r--r--debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian6
-rw-r--r--debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/ksplash-engine-moodin/debian/compat2
-rw-r--r--debian/_base/applications/themes/ksplash-engine-moodin/debian/control2
-rw-r--r--debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat2
-rw-r--r--debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control2
-rw-r--r--debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tde-style-baghira/debian/compat2
-rw-r--r--debian/_base/applications/themes/tde-style-baghira/debian/control2
-rw-r--r--debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian2
-rw-r--r--debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tde-style-domino/debian/compat2
-rw-r--r--debian/_base/applications/themes/tde-style-domino/debian/control2
-rw-r--r--debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tde-style-ia-ora/debian/compat2
-rw-r--r--debian/_base/applications/themes/tde-style-ia-ora/debian/control2
-rw-r--r--debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tde-style-lipstik/debian/compat2
-rw-r--r--debian/_base/applications/themes/tde-style-lipstik/debian/control2
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/changelog125
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/compat1
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/control15
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/copyright16
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/docs2
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/patches/series1
-rwxr-xr-xdebian/_base/applications/themes/tde-style-polyester/debian/rules17
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/source/format (renamed from debian/_base/common/cmake/debian/source/format)0
-rw-r--r--debian/_base/applications/themes/tde-style-polyester/debian/source/options (renamed from debian/_base/common/cmake/debian/source/options)0
-rw-r--r--debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tde-style-qtcurve/debian/compat2
-rw-r--r--debian/_base/applications/themes/tde-style-qtcurve/debian/control2
-rw-r--r--debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/tdmtheme/debian/compat2
-rw-r--r--debian/_base/applications/themes/tdmtheme/debian/control2
-rw-r--r--debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/twin-style-crystal/debian/compat2
-rw-r--r--debian/_base/applications/themes/twin-style-crystal/debian/control2
-rw-r--r--debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/twin-style-dekorator/debian/compat2
-rw-r--r--debian/_base/applications/themes/twin-style-dekorator/debian/control2
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/changelog5
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/compat1
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/control12
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/copyright8
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/patches/series (renamed from debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore)0
-rwxr-xr-xdebian/_base/applications/themes/twin-style-fahrenheit/debian/rules17
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/source/format (renamed from debian/_base/dependencies/python-tqt/debian/source/format)0
-rw-r--r--debian/_base/applications/themes/twin-style-fahrenheit/debian/source/options (renamed from debian/_base/dependencies/python-tqt/debian/source/options)0
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/changelog6
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/compat1
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/control15
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/copyright31
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/patches/series (renamed from debian/_base/libraries/libksquirrel/debian/patches/.gitignore)0
-rwxr-xr-xdebian/_base/applications/themes/twin-style-machbunt/debian/rules17
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/source/format (renamed from debian/_base/libraries/python-trinity/debian/source/format)0
-rw-r--r--debian/_base/applications/themes/twin-style-machbunt/debian/source/options (renamed from debian/_base/libraries/python-trinity/debian/source/options)0
-rw-r--r--debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/themes/twin-style-suse2/debian/compat2
-rw-r--r--debian/_base/applications/themes/twin-style-suse2/debian/control2
-rw-r--r--debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/abakus/debian/compat2
-rw-r--r--debian/_base/applications/utilities/abakus/debian/control2
-rw-r--r--debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/filelight/debian/compat2
-rw-r--r--debian/_base/applications/utilities/filelight/debian/control2
-rw-r--r--debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/kbarcode/debian/compat2
-rw-r--r--debian/_base/applications/utilities/kbarcode/debian/control2
-rw-r--r--debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/kchmviewer/debian/compat2
-rw-r--r--debian/_base/applications/utilities/kchmviewer/debian/control2
-rw-r--r--debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/kcpuload/debian/compat2
-rw-r--r--debian/_base/applications/utilities/kcpuload/debian/control2
-rw-r--r--debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/kdirstat/debian/compat2
-rw-r--r--debian/_base/applications/utilities/kdirstat/debian/control2
-rw-r--r--debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/keep/debian/compat2
-rw-r--r--debian/_base/applications/utilities/keep/debian/control2
-rw-r--r--debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/knutclient/debian/compat2
-rw-r--r--debian/_base/applications/utilities/knutclient/debian/control2
-rw-r--r--debian/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/utilities/kommando/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/utilities/kommando/debian/changelog67
-rw-r--r--debian/_base/applications/utilities/kommando/debian/compat1
-rw-r--r--debian/_base/applications/utilities/kommando/debian/control15
-rw-r--r--debian/_base/applications/utilities/kommando/debian/copyright39
-rw-r--r--debian/_base/applications/utilities/kommando/debian/docs3
-rw-r--r--debian/_base/applications/utilities/kommando/debian/patches/series (renamed from debian/_base/libraries/python-trinity/debian/patches/.gitignore)0
-rwxr-xr-xdebian/_base/applications/utilities/kommando/debian/rules17
-rw-r--r--debian/_base/applications/utilities/kommando/debian/source/format1
-rw-r--r--debian/_base/applications/utilities/kommando/debian/source/options6
-rw-r--r--debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/kompose/debian/compat2
-rw-r--r--debian/_base/applications/utilities/kompose/debian/control2
-rw-r--r--debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/krename/debian/compat2
-rw-r--r--debian/_base/applications/utilities/krename/debian/control2
-rw-r--r--debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/ksensors/debian/compat2
-rw-r--r--debian/_base/applications/utilities/ksensors/debian/control2
-rw-r--r--debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/mathemagics/debian/compat2
-rw-r--r--debian/_base/applications/utilities/mathemagics/debian/control2
-rw-r--r--debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/utilities/qalculate-tde/debian/compat2
-rw-r--r--debian/_base/applications/utilities/qalculate-tde/debian/control2
-rw-r--r--debian/_base/common/cmake/debian/cdbs/debian-tde.mk246
-rw-r--r--debian/_base/common/cmake/debian/changelog5
-rw-r--r--debian/_base/common/cmake/debian/compat1
-rw-r--r--debian/_base/common/cmake/debian/control16
-rw-r--r--debian/_base/core/tde-i18n/debian/compat2
-rw-r--r--debian/_base/core/tde-i18n/debian/control4
-rw-r--r--debian/_base/core/tde-i18n/debian/control-lang2
-rw-r--r--debian/_base/core/tde-i18n/debian/control-source2
-rwxr-xr-xdebian/_base/core/tde-i18n/debian/rules1
-rw-r--r--debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeaccessibility/debian/compat2
-rw-r--r--debian/_base/core/tdeaccessibility/debian/control2
-rw-r--r--debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeaddons/debian/compat2
-rw-r--r--debian/_base/core/tdeaddons/debian/control6
-rw-r--r--debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian3
-rwxr-xr-xdebian/_base/core/tdeaddons/debian/rules12
-rw-r--r--debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeadmin/debian/compat2
-rw-r--r--debian/_base/core/tdeadmin/debian/control2
-rw-r--r--debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeartwork/debian/compat2
-rw-r--r--debian/_base/core/tdeartwork/debian/control2
-rw-r--r--debian/_base/core/tdebase/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdebase/debian/compat2
-rw-r--r--debian/_base/core/tdebase/debian/control3
-rw-r--r--debian/_base/core/tdebase/debian/kdesktop-trinity.postinst13
-rw-r--r--debian/_base/core/tdebase/debian/khelpcenter-trinity.install4
-rw-r--r--debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst13
-rw-r--r--debian/_base/core/tdebase/debian/klipper-trinity.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/klipper-trinity.postinst13
-rw-r--r--debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst13
-rw-r--r--debian/_base/core/tdebase/debian/konqueror-trinity.docs2
-rw-r--r--debian/_base/core/tdebase/debian/konsole-trinity.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/konsole-trinity.postinst5
-rw-r--r--debian/_base/core/tdebase/debian/ksmserver-trinity.lintian1
-rw-r--r--debian/_base/core/tdebase/debian/ksmserver-trinity.postinst5
-rw-r--r--debian/_base/core/tdebase/debian/libkonq4-trinity.docs2
-rwxr-xr-xdebian/_base/core/tdebase/debian/rules4
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-data-trinity.install6
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.install4
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/tdeprint-trinity.lintian2
-rw-r--r--debian/_base/core/tdebase/debian/tdeprint-trinity.postinst13
-rw-r--r--debian/_base/core/tdebase/debian/tdm-trinity.postrm3
-rw-r--r--debian/_base/core/tdebase/debian/tdm-trinity.prerm2
-rw-r--r--debian/_base/core/tdebase/debian/twin-trinity.install39
-rw-r--r--debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdebindings/debian/compat2
-rw-r--r--debian/_base/core/tdebindings/debian/control24
-rw-r--r--debian/_base/core/tdebindings/debian/python-dcop-trinity.install1
-rw-r--r--debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs (renamed from debian/_base/core/tdebindings/debian/python-dcop-trinity.docs)0
-rw-r--r--debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples (renamed from debian/_base/core/tdebindings/debian/python-dcop-trinity.examples)0
-rw-r--r--debian/_base/core/tdebindings/debian/python3-dcop-trinity.install1
-rwxr-xr-xdebian/_base/core/tdebindings/debian/rules11
-rw-r--r--debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeedu/debian/compat2
-rw-r--r--debian/_base/core/tdeedu/debian/control2
-rw-r--r--debian/_base/core/tdegames/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdegames/debian/compat2
-rw-r--r--debian/_base/core/tdegames/debian/control2
-rw-r--r--debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdegraphics/debian/compat2
-rw-r--r--debian/_base/core/tdegraphics/debian/control2
-rw-r--r--debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian2
-rw-r--r--debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian2
-rw-r--r--debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdelibs/debian/compat2
-rw-r--r--debian/_base/core/tdelibs/debian/control4
-rwxr-xr-xdebian/_base/core/tdelibs/debian/rules46
-rw-r--r--debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install1
-rw-r--r--debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst1
-rw-r--r--debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm1
-rw-r--r--debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdemultimedia/debian/compat2
-rw-r--r--debian/_base/core/tdemultimedia/debian/control2
-rw-r--r--debian/_base/core/tdemultimedia/debian/kmix-trinity.install27
-rw-r--r--debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian2
-rw-r--r--debian/_base/core/tdemultimedia/debian/krec-trinity.lintian2
-rw-r--r--debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdenetwork/debian/compat2
-rw-r--r--debian/_base/core/tdenetwork/debian/control2
-rw-r--r--debian/_base/core/tdenetwork/debian/kdict-trinity.postinst13
-rw-r--r--debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian2
-rw-r--r--debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst13
-rw-r--r--debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian2
-rw-r--r--debian/_base/core/tdepim/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdepim/debian/compat2
-rw-r--r--debian/_base/core/tdepim/debian/control4
-rwxr-xr-xdebian/_base/core/tdepim/debian/rules58
-rw-r--r--debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdesdk/debian/cervisia-trinity.lintian2
-rw-r--r--debian/_base/core/tdesdk/debian/cervisia-trinity.postinst13
-rw-r--r--debian/_base/core/tdesdk/debian/compat2
-rw-r--r--debian/_base/core/tdesdk/debian/control10
-rwxr-xr-xdebian/_base/core/tdesdk/debian/rules31
-rw-r--r--debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdetoys/debian/compat2
-rw-r--r--debian/_base/core/tdetoys/debian/control2
-rw-r--r--debian/_base/core/tdetoys/debian/kweather-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/ark-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdeutils/debian/compat2
-rw-r--r--debian/_base/core/tdeutils/debian/control2
-rw-r--r--debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/kcalc-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/kedit-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/kedit-trinity.postinst13
-rwxr-xr-xdebian/_base/core/tdeutils/debian/rules6
-rw-r--r--debian/_base/core/tdeutils/debian/superkaramba-trinity.examples12
-rw-r--r--debian/_base/core/tdeutils/debian/superkaramba-trinity.install1
-rw-r--r--debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst13
-rw-r--r--debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdevelop/debian/compat2
-rw-r--r--debian/_base/core/tdevelop/debian/control4
-rw-r--r--debian/_base/core/tdevelop/debian/watch2
-rw-r--r--debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/core/tdewebdev/debian/compat2
-rw-r--r--debian/_base/core/tdewebdev/debian/control2
-rw-r--r--debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/akode/debian/compat2
-rw-r--r--debian/_base/dependencies/akode/debian/control2
-rw-r--r--debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/arts/debian/compat2
-rw-r--r--debian/_base/dependencies/arts/debian/control4
-rwxr-xr-xdebian/_base/dependencies/arts/debian/rules51
-rw-r--r--debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/avahi-tqt/debian/compat2
-rw-r--r--debian/_base/dependencies/avahi-tqt/debian/control4
-rw-r--r--debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/dbus-1-tqt/debian/compat2
-rw-r--r--debian/_base/dependencies/dbus-1-tqt/debian/control2
-rw-r--r--debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/dbus-tqt/debian/compat2
-rw-r--r--debian/_base/dependencies/dbus-tqt/debian/control2
-rw-r--r--debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/libart-lgpl/debian/compat2
-rw-r--r--debian/_base/dependencies/libart-lgpl/debian/control2
-rw-r--r--debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/libcaldav/debian/compat2
-rw-r--r--debian/_base/dependencies/libcaldav/debian/control2
-rwxr-xr-xdebian/_base/dependencies/libcaldav/debian/rules44
-rw-r--r--debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/libcarddav/debian/compat2
-rw-r--r--debian/_base/dependencies/libcarddav/debian/control2
-rwxr-xr-xdebian/_base/dependencies/libcarddav/debian/rules44
-rw-r--r--debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/libr/debian/compat2
-rw-r--r--debian/_base/dependencies/libr/debian/control6
-rw-r--r--debian/_base/dependencies/libr/debian/libr1.dirs (renamed from debian/_base/dependencies/libr/debian/libr0.dirs)0
-rw-r--r--debian/_base/dependencies/libr/debian/libr1.install (renamed from debian/_base/dependencies/libr/debian/libr0.install)0
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/compat2
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/control2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/README.Debian4
-rw-r--r--debian/_base/dependencies/python-tqt/debian/changelog6
-rw-r--r--debian/_base/dependencies/python-tqt/debian/compat1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/control200
-rw-r--r--debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.183
-rw-r--r--debian/_base/dependencies/python-tqt/debian/manpages/pyuic.174
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides14
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt.install7
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqtext.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqt.install7
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqtext.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages2
-rwxr-xr-xdebian/_base/dependencies/python-tqt/debian/rules214
-rw-r--r--debian/_base/dependencies/pytqt/debian/README.Debian3
-rw-r--r--debian/_base/dependencies/pytqt/debian/changelog6
-rw-r--r--debian/_base/dependencies/pytqt/debian/compat1
-rw-r--r--debian/_base/dependencies/pytqt/debian/control128
-rw-r--r--debian/_base/dependencies/pytqt/debian/copyright (renamed from debian/_base/dependencies/python-tqt/debian/copyright)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/docs (renamed from debian/_base/dependencies/python-tqt/debian/docs)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/manpages/pytqlupdate.183
-rw-r--r--debian/_base/dependencies/pytqt/debian/manpages/pytquic.174
-rw-r--r--debian/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff (renamed from debian/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/patches/series (renamed from debian/_base/dependencies/python-tqt/debian/patches/series)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/python3-pytqt-gl.install1
-rw-r--r--debian/_base/dependencies/pytqt/debian/python3-pytqt.install7
-rw-r--r--debian/_base/dependencies/pytqt/debian/python3-pytqtext.install1
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-dev.dirs (renamed from debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-dev.install (renamed from debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides14
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-doc.dirs2
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-doc.examples (renamed from debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-doc.install1
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-tools.install (renamed from debian/_base/dependencies/python-tqt/debian/pytqt-tools.install)0
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages2
-rw-r--r--debian/_base/dependencies/pytqt/debian/pytqtconfig_py3.py17
-rwxr-xr-xdebian/_base/dependencies/pytqt/debian/rules191
-rw-r--r--debian/_base/dependencies/pytqt/debian/source/format1
-rw-r--r--debian/_base/dependencies/pytqt/debian/source/options6
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/compat2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/control72
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt49
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt49
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt47
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1151
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1151
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1149
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links1
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install1
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs (renamed from debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs)0
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links1
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/pyversions1
-rwxr-xr-xdebian/_base/dependencies/sip4-tqt/debian/rules54
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install1
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages1
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py6
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl (renamed from debian/_base/common/cmake/debian/cdbs/cmake-versions.pl)0
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/changelog11
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/compat1
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/control19
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/copyright (renamed from debian/_base/common/cmake/debian/copyright)0
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/patches/series (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1)0
-rwxr-xr-xdebian/_base/dependencies/tde-cmake/debian/rules (renamed from debian/_base/common/cmake/debian/rules)0
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/source/format1
-rw-r--r--debian/_base/dependencies/tde-cmake/debian/source/options6
-rw-r--r--debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/tqca/debian/compat2
-rw-r--r--debian/_base/dependencies/tqca/debian/control2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/compat2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/control2
-rw-r--r--debian/_base/dependencies/tqt3/debian/README.Debian20
-rw-r--r--debian/_base/dependencies/tqt3/debian/compat2
-rw-r--r--debian/_base/dependencies/tqt3/debian/control48
-rw-r--r--debian/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install3
-rw-r--r--debian/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install48
-rw-r--r--debian/_base/dependencies/tqt3/debian/libtqt3-headers.install2
-rw-r--r--debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs3
-rw-r--r--debian/_base/dependencies/tqt3/debian/libtqt3-mt.docs3
-rwxr-xr-xdebian/_base/dependencies/tqt3/debian/rules44
-rw-r--r--debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install6
-rw-r--r--debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links6
-rw-r--r--debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install1
-rw-r--r--debian/_base/dependencies/tqt3/debian/tqt3-doc.docs1
-rw-r--r--debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/dependencies/tqtinterface/debian/compat2
-rw-r--r--debian/_base/dependencies/tqtinterface/debian/control2
-rw-r--r--debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/libraries/kipi-plugins/debian/compat2
-rw-r--r--debian/_base/libraries/kipi-plugins/debian/control2
-rw-r--r--debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/libraries/libkdcraw/debian/compat2
-rw-r--r--debian/_base/libraries/libkdcraw/debian/control2
-rw-r--r--debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/libraries/libkexiv2/debian/compat2
-rw-r--r--debian/_base/libraries/libkexiv2/debian/control2
-rw-r--r--debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/libraries/libkipi/debian/compat2
-rw-r--r--debian/_base/libraries/libkipi/debian/control2
-rw-r--r--debian/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/libraries/libksquirrel/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/libraries/libksquirrel/debian/compat2
-rw-r--r--debian/_base/libraries/libksquirrel/debian/control10
-rw-r--r--debian/_base/libraries/libksquirrel/debian/patches/series (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1)0
-rwxr-xr-xdebian/_base/libraries/libksquirrel/debian/rules123
-rw-r--r--debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/libraries/libtdeldap/debian/compat2
-rw-r--r--debian/_base/libraries/libtdeldap/debian/control2
-rw-r--r--debian/_base/libraries/libtqt-perl/debian/compat2
-rw-r--r--debian/_base/libraries/libtqt-perl/debian/control2
-rw-r--r--debian/_base/libraries/pytde/debian/NEWS.Debian (renamed from debian/_base/libraries/python-trinity/debian/NEWS.Debian)0
-rw-r--r--debian/_base/libraries/pytde/debian/changelog386
-rw-r--r--debian/_base/libraries/pytde/debian/compat1
-rw-r--r--debian/_base/libraries/pytde/debian/control52
-rw-r--r--debian/_base/libraries/pytde/debian/copyright (renamed from debian/_base/libraries/python-trinity/debian/copyright)0
-rw-r--r--debian/_base/libraries/pytde/debian/patches/.gitignore0
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-dev.dirs1
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-dev.install2
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-doc.dirs3
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-doc.doc-base12
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-doc.examples (renamed from debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples)0
-rw-r--r--debian/_base/libraries/pytde/debian/pytde-doc.install1
-rw-r--r--debian/_base/libraries/pytde/debian/pytdeconfig.py17
-rw-r--r--debian/_base/libraries/pytde/debian/python3-pytde.install2
-rwxr-xr-xdebian/_base/libraries/pytde/debian/rules181
-rw-r--r--debian/_base/libraries/pytde/debian/source/format1
-rw-r--r--debian/_base/libraries/pytde/debian/source/options6
-rw-r--r--debian/_base/libraries/pytdeextensions/debian/compat2
-rw-r--r--debian/_base/libraries/pytdeextensions/debian/control12
-rw-r--r--debian/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk297
-rw-r--r--debian/_base/libraries/pytdeextensions/debian/pyversions1
-rwxr-xr-xdebian/_base/libraries/pytdeextensions/debian/rules16
-rw-r--r--debian/_base/libraries/python-trinity/debian/changelog386
-rw-r--r--debian/_base/libraries/python-trinity/debian/compat1
-rw-r--r--debian/_base/libraries/python-trinity/debian/control56
-rw-r--r--debian/_base/libraries/python-trinity/debian/pytdeconfig.py11
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs1
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs3
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base12
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install1
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install3
-rwxr-xr-xdebian/_base/libraries/python-trinity/debian/rules179
-rw-r--r--debian/_base/metapackages/desktop-base/Makefile (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/Makefile)0
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-640x480.png)bin84100 -> 84100 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-widescreen.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.png)bin33843 -> 33843 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.xcf.gz)bin25737 -> 25737 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.png)bin50393 -> 50393 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.svg.tar.bz2)bin34079 -> 34079 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.png)bin353300 -> 353300 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.png)bin384769 -> 384769 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.png)bin180869 -> 180869 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.xcf.tar.bz2)bin309728 -> 309728 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/debian-desktop-logo.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/debian-desktop-logo.png)bin83560 -> 83560 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/debian-homepage.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/debian-homepage.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/debian-reference.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/debian-reference.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/debian-security.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/debian-security.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/debian/compat2
-rw-r--r--debian/_base/metapackages/desktop-base/debian/control2
-rw-r--r--debian/_base/metapackages/desktop-base/debian/distrospecific/.gitignore0
-rw-r--r--debian/_base/metapackages/desktop-base/emblems/emblem-debian.icon (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.icon)0
-rw-r--r--debian/_base/metapackages/desktop-base/emblems/emblem-debian.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.png)bin1258 -> 1258 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/gnome-backgrounds.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/gnome-backgrounds.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/kompmgr-rc-files/compton-tde.conf (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf)0
-rw-r--r--debian/_base/metapackages/desktop-base/kompmgr-rc-files/xcompmgrrc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Preview.png)bin47513 -> 47513 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_active_bar.png)bin23062 -> 23062 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_bottom.png)bin262 -> 262 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png)bin22841 -> 22841 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_top.png)bin21180 -> 21180 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Background.png)bin240443 -> 240443 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Preview.png)bin45481 -> 45481 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz)bin40703 -> 40703 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Preview.png)bin104782 -> 104782 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_active_bar.png)bin26032 -> 26032 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_bottom.png)bin269 -> 269 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png)bin24992 -> 24992 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_top.png)bin77584 -> 77584 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Background.png)bin307964 -> 307964 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Preview.png)bin47149 -> 47149 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Preview.png)bin27509 -> 27509 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2)bin119144 -> 119144 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_active_bar.png)bin24676 -> 24676 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_bottom.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_bottom.png)bin305 -> 305 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_inactive_bar.png)bin24286 -> 24286 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_top.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_top.png)bin65744 -> 65744 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/1.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/1.png)bin8946 -> 8946 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/2.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/2.png)bin9230 -> 9230 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/3.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/3.png)bin9151 -> 9151 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/4.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/4.png)bin9616 -> 9616 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/5.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/5.png)bin9835 -> 9835 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/6.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/6.png)bin10130 -> 10130 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/7.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/7.png)bin10098 -> 10098 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/8.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/8.png)bin10854 -> 10854 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Preview.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Preview.png)bin92945 -> 92945 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Theme.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Theme.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/background.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/background.png)bin180869 -> 180869 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2)bin149692 -> 149692 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/pixmaps/debian-security.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.png)bin3171 -> 3171 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/pixmaps/debian-security.xcf (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.xcf)bin5358 -> 5358 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/kdesktoprc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/ksplashrc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/ksplashrc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/twinrc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/tde-profile/tdeglobals (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdeglobals)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/tde-profile/tdm/backgroundrc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdm/backgroundrc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-session.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-splash.rc)0
-rw-r--r--debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4/mcs_settings/desktop.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.png)bin43810 -> 43810 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.xcf.gz (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.xcf.gz)bin136391 -> 136391 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/gnome-splash-curves.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-splash-curves.png)bin22805 -> 22805 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.png)bin92322 -> 92322 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.svg.tar.bz2)bin45430 -> 45430 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/nightly-splash.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.png)bin111397 -> 111397 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splash/nightly-splash.xcf.tar.bz2 (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.xcf.tar.bz2)bin269364 -> 269364 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/VeraSans.ttf (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/VeraSans.ttf)bin65932 -> 65932 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-bw.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-bw.png)bin91994 -> 91994 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-color.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-color.png)bin388273 -> 388273 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/theme.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/theme.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/background.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/background.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/boundingbox.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/boundingbox.png)bin17856 -> 17856 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/debian-moreblue.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-reboot.png)bin670 -> 670 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-session.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-session.png)bin1236 -> 1236 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/screenshot.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/screenshot.png)bin68983 -> 68983 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/swirl.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/swirl.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.png)bin246988 -> 246988 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/boundingbox.png)bin4434 -> 4434 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-reboot.png)bin670 -> 670 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-session.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-session.png)bin1236 -> 1236 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/moreblue-orbit.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/screenshot.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/screenshot.png)bin40816 -> 40816 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/KdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions.png)bin19056 -> 19056 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions_inactive.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions_inactive.png)bin12001 -> 12001 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/System.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System.png)bin10658 -> 10658 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/System_inactive.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System_inactive.png)bin7285 -> 7285 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/background.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/background.png)bin195426 -> 195426 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/boundingbox.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/boundingbox.png)bin103486 -> 103486 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/nightly.xml (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/nightly.xml)0
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/nightly/screenshot.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/screenshot.png)bin51277 -> 51277 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/tdm-theme/tdm.d/10_desktop-base (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base)0
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/Makefile (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/Makefile)0
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/background.svg (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/background.svg)0
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/cmap.gif (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/cmap.gif)bin472522 -> 472522 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/progress.png (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/progress.png)bin4543 -> 4543 bytes
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.c (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.c)0
-rw-r--r--debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.in (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.in)0
-rwxr-xr-xdebian/_base/metapackages/desktop-base/usplash/moreblue-orbit/themesetup.sh (renamed from debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/themesetup.sh)0
-rw-r--r--debian/_base/metapackages/meta-tde/debian/compat2
-rw-r--r--debian/_base/metapackages/meta-tde/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/Makefile (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/Makefile)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/background.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/background.png)bin78100 -> 78100 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/head.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/head.png)bin170 -> 170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/stylesheet.css (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/stylesheet.css)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/edgyWallpaper.tar.gz)bin2173935 -> 2173935 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/enterprise-desktop.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/enterprise-desktop.png)bin744964 -> 744964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg)bin114579 -> 114579 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg)bin149530 -> 149530 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg)bin118278 -> 118278 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg)bin142175 -> 142175 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg)bin235613 -> 235613 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg)bin258562 -> 258562 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg)bin123379 -> 123379 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg)bin211337 -> 211337 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg)bin161481 -> 161481 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg)bin202490 -> 202490 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg)bin294958 -> 294958 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg)bin256693 -> 256693 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg)bin175062 -> 175062 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg)bin266921 -> 266921 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg)bin202826 -> 202826 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg)bin273201 -> 273201 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg)bin411015 -> 411015 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg)bin368619 -> 368619 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg)bin353197 -> 353197 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg)bin567472 -> 567472 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg)bin425569 -> 425569 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg)bin522563 -> 522563 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg)bin722467 -> 722467 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg)bin816479 -> 816479 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg)bin84379 -> 84379 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg)bin170816 -> 170816 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg)bin110605 -> 110605 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg)bin132080 -> 132080 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg)bin237775 -> 237775 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg)bin308219 -> 308219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg)bin246751 -> 246751 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg)bin398821 -> 398821 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg)bin323553 -> 323553 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg)bin380135 -> 380135 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg)bin525003 -> 525003 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg)bin617460 -> 617460 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg)bin525966 -> 525966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg)bin889462 -> 889462 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg)bin634679 -> 634679 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg)bin833599 -> 833599 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg)bin1205580 -> 1205580 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg)bin1391279 -> 1391279 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg)bin90644 -> 90644 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg)bin149323 -> 149323 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg)bin211470 -> 211470 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg)bin289814 -> 289814 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg)bin218701 -> 218701 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg)bin159592 -> 159592 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg)bin188963 -> 188963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg)bin268052 -> 268052 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg)bin201447 -> 201447 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg)bin276600 -> 276600 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg)bin368228 -> 368228 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg)bin419997 -> 419997 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg)bin138360 -> 138360 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg)bin237714 -> 237714 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg)bin192095 -> 192095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg)bin245321 -> 245321 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg)bin159966 -> 159966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg)bin125410 -> 125410 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg)bin253124 -> 253124 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg)bin423711 -> 423711 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg)bin292487 -> 292487 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg)bin388964 -> 388964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg)bin522810 -> 522810 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg)bin520630 -> 520630 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg)bin108004 -> 108004 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg)bin197202 -> 197202 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg)bin131057 -> 131057 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg)bin178363 -> 178363 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg)bin288487 -> 288487 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg)bin236706 -> 236706 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg)bin222848 -> 222848 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg)bin334860 -> 334860 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg)bin271391 -> 271391 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg)bin332445 -> 332445 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg)bin467015 -> 467015 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg)bin593779 -> 593779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg)bin265865 -> 265865 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg)bin383095 -> 383095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg)bin338174 -> 338174 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg)bin407255 -> 407255 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg)bin534934 -> 534934 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg)bin591047 -> 591047 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg)bin315191 -> 315191 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg)bin481894 -> 481894 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg)bin396458 -> 396458 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg)bin521613 -> 521613 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg)bin702432 -> 702432 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg)bin967695 -> 967695 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg)bin159004 -> 159004 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg)bin121195 -> 121195 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg)bin191332 -> 191332 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg)bin255434 -> 255434 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg)bin177952 -> 177952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg)bin141450 -> 141450 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg)bin149242 -> 149242 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg)bin235425 -> 235425 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg)bin194279 -> 194279 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg)bin240472 -> 240472 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg)bin341441 -> 341441 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg)bin308744 -> 308744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg)bin253511 -> 253511 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg)bin364307 -> 364307 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg)bin294385 -> 294385 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg)bin356919 -> 356919 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg)bin532240 -> 532240 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg)bin564941 -> 564941 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/index.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/index.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_admin.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_admin.png)bin755 -> 755 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_away.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_away.png)bin473 -> 473 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_halfop.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_halfop.png)bin751 -> 751 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_normal.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_normal.png)bin744 -> 744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_op.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_op.png)bin753 -> 753 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_owner.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_owner.png)bin740 -> 740 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_voice.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_voice.png)bin744 -> 744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Dialog.png)bin58313 -> 58313 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Preview.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Preview.png)bin143500 -> 143500 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/ReadMe.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Theme.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Theme.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg)bin44757 -> 44757 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg)bin258562 -> 258562 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg)bin299494 -> 299494 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png)bin465 -> 465 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side.png)bin2843 -> 2843 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png)bin1310 -> 1310 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background.png)bin27184 -> 27184 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-login.ogg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-login.ogg)bin32397 -> 32397 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg)bin1804977 -> 1804977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-panel.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-panel.png)bin1373 -> 1373 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg)bin409496 -> 409496 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png)bin1157493 -> 1157493 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/background.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/background.png)bin78100 -> 78100 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/default.css (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/default.css)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/head.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/head.png)bin170 -> 170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/layout.html (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/layout.html)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png)bin50739 -> 50739 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png)bin470224 -> 470224 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/Dialog.png)bin17219 -> 17219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/kubuntu.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/preview.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/preview.png)bin470224 -> 470224 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_over.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png)bin776 -> 776 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png)bin800 -> 800 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png)bin794 -> 794 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png)bin792 -> 792 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png)bin789 -> 789 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png)bin769 -> 769 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png)bin764 -> 764 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png)bin758 -> 758 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png)bin783 -> 783 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png)bin763 -> 763 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png)bin774 -> 774 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png)bin759 -> 759 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png)bin763 -> 763 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png)bin768 -> 768 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png)bin769 -> 769 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png)bin765 -> 765 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png)bin777 -> 777 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png)bin788 -> 788 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png)bin793 -> 793 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png)bin795 -> 795 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png)bin792 -> 792 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png)bin774 -> 774 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png)bin777 -> 777 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png)bin761 -> 761 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png)bin767 -> 767 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png)bin773 -> 773 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png)bin795 -> 795 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/trinity.png)bin38288 -> 38288 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png)bin1199 -> 1199 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png)bin1188 -> 1188 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png)bin1195 -> 1195 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png)bin1203 -> 1203 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png)bin1181 -> 1181 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png)bin1190 -> 1190 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png)bin1155 -> 1155 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png)bin1183 -> 1183 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png)bin1189 -> 1189 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png)bin1209 -> 1209 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png)bin1185 -> 1185 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png)bin1184 -> 1184 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png)bin1177 -> 1177 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png)bin1163 -> 1163 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png)bin1163 -> 1163 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png)bin1190 -> 1190 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png)bin1170 -> 1170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png)bin1187 -> 1187 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png)bin1212 -> 1212 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png)bin1203 -> 1203 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png)bin1199 -> 1199 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png)bin1194 -> 1194 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png)bin1165 -> 1165 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png)bin1167 -> 1167 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png)bin1165 -> 1165 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png)bin1164 -> 1164 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png)bin1171 -> 1171 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png)bin1193 -> 1193 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png)bin1185 -> 1185 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png)bin1177 -> 1177 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png)bin1215 -> 1215 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png)bin1196 -> 1196 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png)bin1219 -> 1219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png)bin1200 -> 1200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png)bin1189 -> 1189 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png)bin1174 -> 1174 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png)bin1191 -> 1191 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png)bin1172 -> 1172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png)bin1172 -> 1172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png)bin1160 -> 1160 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png)bin1164 -> 1164 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png)bin1192 -> 1192 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png)bin1173 -> 1173 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png)bin1170 -> 1170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/trinity.png)bin62916 -> 62916 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png)bin1967 -> 1967 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png)bin1987 -> 1987 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png)bin1980 -> 1980 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png)bin1963 -> 1963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png)bin1990 -> 1990 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png)bin1972 -> 1972 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png)bin1963 -> 1963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png)bin1995 -> 1995 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png)bin1953 -> 1953 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png)bin1996 -> 1996 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png)bin1986 -> 1986 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png)bin1966 -> 1966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png)bin1964 -> 1964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png)bin1971 -> 1971 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png)bin1975 -> 1975 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png)bin1946 -> 1946 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png)bin1949 -> 1949 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png)bin1973 -> 1973 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png)bin1980 -> 1980 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png)bin1992 -> 1992 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png)bin1965 -> 1965 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png)bin1959 -> 1959 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png)bin1932 -> 1932 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png)bin1938 -> 1938 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png)bin1921 -> 1921 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png)bin1923 -> 1923 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png)bin1922 -> 1922 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png)bin1912 -> 1912 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png)bin1933 -> 1933 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png)bin1911 -> 1911 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png)bin1942 -> 1942 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png)bin1969 -> 1969 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png)bin1952 -> 1952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png)bin1974 -> 1974 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png)bin1973 -> 1973 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png)bin1979 -> 1979 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png)bin1976 -> 1976 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png)bin1970 -> 1970 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png)bin1978 -> 1978 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png)bin1977 -> 1977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png)bin1992 -> 1992 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png)bin1994 -> 1994 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png)bin1977 -> 1977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png)bin1994 -> 1994 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png)bin1985 -> 1985 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png)bin1964 -> 1964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png)bin1936 -> 1936 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png)bin1935 -> 1935 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png)bin1965 -> 1965 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png)bin1975 -> 1975 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png)bin1956 -> 1956 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png)bin1952 -> 1952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png)bin1936 -> 1936 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png)bin1943 -> 1943 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png)bin1956 -> 1956 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/trinity.png)bin108843 -> 108843 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png)bin3068 -> 3068 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png)bin3135 -> 3135 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png)bin3154 -> 3154 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png)bin3200 -> 3200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png)bin3128 -> 3128 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png)bin3167 -> 3167 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png)bin3158 -> 3158 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png)bin3149 -> 3149 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png)bin3083 -> 3083 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png)bin3069 -> 3069 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png)bin3061 -> 3061 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png)bin3129 -> 3129 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png)bin3089 -> 3089 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png)bin3114 -> 3114 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png)bin3086 -> 3086 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png)bin3077 -> 3077 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png)bin3082 -> 3082 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png)bin3064 -> 3064 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png)bin3084 -> 3084 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png)bin3087 -> 3087 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png)bin3052 -> 3052 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png)bin3111 -> 3111 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png)bin3140 -> 3140 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png)bin3138 -> 3138 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png)bin3188 -> 3188 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png)bin3200 -> 3200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png)bin3144 -> 3144 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png)bin3159 -> 3159 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png)bin3145 -> 3145 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png)bin3157 -> 3157 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png)bin3113 -> 3113 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png)bin3029 -> 3029 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png)bin3026 -> 3026 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png)bin3050 -> 3050 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png)bin3036 -> 3036 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png)bin3053 -> 3053 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png)bin3057 -> 3057 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png)bin3082 -> 3082 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png)bin3099 -> 3099 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png)bin3081 -> 3081 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png)bin3141 -> 3141 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png)bin3139 -> 3139 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png)bin3101 -> 3101 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png)bin3066 -> 3066 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png)bin3095 -> 3095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png)bin3109 -> 3109 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png)bin3134 -> 3134 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png)bin3160 -> 3160 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png)bin3206 -> 3206 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png)bin3247 -> 3247 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png)bin3211 -> 3211 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png)bin3169 -> 3169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png)bin3183 -> 3183 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png)bin3172 -> 3172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png)bin3120 -> 3120 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png)bin3048 -> 3048 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png)bin3038 -> 3038 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png)bin3059 -> 3059 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png)bin3126 -> 3126 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png)bin3115 -> 3115 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png)bin3095 -> 3095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png)bin3073 -> 3073 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png)bin3096 -> 3096 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png)bin3079 -> 3079 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png)bin3037 -> 3037 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png)bin3022 -> 3022 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png)bin3001 -> 3001 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png)bin3037 -> 3037 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png)bin3079 -> 3079 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/trinity.png)bin164940 -> 164940 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/gear.3ds (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/gear.3ds)bin993179 -> 993179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient-inactive.png)bin196 -> 196 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient.png)bin322 -> 322 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/backgroundrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/backgroundrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/circle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/copy)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crosshair)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dot)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dotbox)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_large)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_small)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draped_box)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fleur)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand1)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand2)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/link (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/link)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/move (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/move)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pencil)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pirate)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/plus)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/tcross)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/watch)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/cursors/index.theme (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/index.theme)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/compat2
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/control3
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/.gitignore0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/default-icon-positions/IconPositions (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/default-icon-positions/IconPositions)0
-rwxr-xr-xdebian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen128.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen128.png)bin7355 -> 7355 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen64.png (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen64.png)bin3305 -> 3305 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.10
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-home (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-home)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-media (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/hidden-media (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/hidden-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_managerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_managerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_notifierrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_notifierrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/amarokrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/amarokrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/arkrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/arkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/cryptodefaults (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/cryptodefaults)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/d3lphinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/d3lphinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0 (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc-2.0)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3b.eventsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3brc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3brc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kaffeinerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kaffeinerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katapultrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katapultrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kbookmarkrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kbookmarkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmlaptoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmnspluginrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcookiejarrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcookiejarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kgpgrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kgpgrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/khelpcenterrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/khelpcenterrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/klipperrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/klipperrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmailrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmailrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmixrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmixrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmplayerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmplayerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knemorc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knemorc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotesrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotesrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotify.eventsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konqiconviewrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konqiconviewrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konsolerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konsolerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kontactrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kontactrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konversationrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konversationrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kopeterc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kopeterc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/korgacrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/korgacrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kscdrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kscdrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ksplashrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ksplashrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktaskbarrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktaskbarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktiprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktiprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuriikwsfilterrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuserrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuserrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/metabarrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/metabarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/profilerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/profilerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/skimrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/skimrc)0
-rwxr-xr-xdebian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/startupconfig (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/startupconfig)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/systemtray_panelappletrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdehtmlrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdehtmlrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdeio_httprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdeio_httprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdelaunchrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdelaunchrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdewalletrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdewalletrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twincrystalrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twincrystalrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/uiserver (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/uiserver)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/yakuakerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/yakuakerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/colors)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-home (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-home)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-media (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/hidden-media (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/hidden-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/cryptodefaults)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/dolphinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/katerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/katerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kmixrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/ktiprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kuserrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdewalletrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/keyboard-rc-files/win-key.sh (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/keyboard-rc-files/win-key.sh)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/konqueror-profile/konq_plugins.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-plugins/dirfilterplugin.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/gvimagepart.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ksvgplugin.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/part.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/part.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-7z.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-7z.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-ace.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-ace.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arc.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arc.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-archive.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-archive.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arj.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arj.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip2.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip2.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-compress.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-compress.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-cpio.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-cpio.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-gzip.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-gzip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lha.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lha.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lzop.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lzop.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-pak.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-pak.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-rar.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-rar.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tar.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tar.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tarz.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tarz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tbz.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tbz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tgz.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tgz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tzo.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tzo.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zip.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zoo.desktop (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zoo.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/kstylerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/kstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/lipstikstylerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/lipstikstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/polyesterstylerc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/polyesterstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/tde-profile/kde4rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/kde4rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tde-user-profile (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tde-user-profile)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tderc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tderc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl)bin148 -> 148 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/tdmdistrc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdmdistrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/gwenviewui.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/konqueror.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/konqueror.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc (renamed from debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/kopetechatwindow.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/Makefile (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/Makefile)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/amarok/background.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/background.png)bin78100 -> 78100 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/amarok/head.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/head.png)bin170 -> 170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/amarok/stylesheet.css (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/edgyWallpaper.tar.gz (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz)bin2173935 -> 2173935 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/enterprise-desktop.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/enterprise-desktop.png)bin744964 -> 744964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg)bin114579 -> 114579 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg)bin149530 -> 149530 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg)bin118278 -> 118278 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg)bin142175 -> 142175 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg)bin235613 -> 235613 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg)bin258562 -> 258562 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg)bin123379 -> 123379 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg)bin211337 -> 211337 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg)bin161481 -> 161481 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg)bin202490 -> 202490 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg)bin294958 -> 294958 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg)bin256693 -> 256693 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg)bin175062 -> 175062 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg)bin266921 -> 266921 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg)bin202826 -> 202826 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg)bin273201 -> 273201 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg)bin411015 -> 411015 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg)bin368619 -> 368619 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg)bin353197 -> 353197 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg)bin567472 -> 567472 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg)bin425569 -> 425569 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg)bin522563 -> 522563 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg)bin722467 -> 722467 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg)bin816479 -> 816479 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg)bin84379 -> 84379 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg)bin170816 -> 170816 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg)bin110605 -> 110605 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg)bin132080 -> 132080 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg)bin237775 -> 237775 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg)bin308219 -> 308219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg)bin246751 -> 246751 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg)bin398821 -> 398821 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg)bin323553 -> 323553 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg)bin380135 -> 380135 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg)bin525003 -> 525003 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg)bin617460 -> 617460 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg)bin525966 -> 525966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg)bin889462 -> 889462 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg)bin634679 -> 634679 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg)bin833599 -> 833599 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg)bin1205580 -> 1205580 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg)bin1391279 -> 1391279 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg)bin90644 -> 90644 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg)bin149323 -> 149323 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg)bin211470 -> 211470 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg)bin289814 -> 289814 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg)bin218701 -> 218701 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg)bin159592 -> 159592 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg)bin188963 -> 188963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg)bin268052 -> 268052 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg)bin201447 -> 201447 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg)bin276600 -> 276600 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg)bin368228 -> 368228 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg)bin419997 -> 419997 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg)bin138360 -> 138360 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg)bin237714 -> 237714 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg)bin192095 -> 192095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg)bin245321 -> 245321 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg)bin159966 -> 159966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg)bin125410 -> 125410 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg)bin253124 -> 253124 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg)bin423711 -> 423711 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg)bin292487 -> 292487 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg)bin388964 -> 388964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg)bin522810 -> 522810 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg)bin520630 -> 520630 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg)bin108004 -> 108004 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg)bin197202 -> 197202 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg)bin131057 -> 131057 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg)bin178363 -> 178363 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg)bin288487 -> 288487 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg)bin236706 -> 236706 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg)bin222848 -> 222848 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg)bin334860 -> 334860 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg)bin271391 -> 271391 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg)bin332445 -> 332445 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg)bin467015 -> 467015 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg)bin593779 -> 593779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg)bin265865 -> 265865 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg)bin383095 -> 383095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg)bin338174 -> 338174 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg)bin407255 -> 407255 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg)bin534934 -> 534934 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg)bin591047 -> 591047 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg)bin315191 -> 315191 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg)bin481894 -> 481894 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg)bin396458 -> 396458 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg)bin521613 -> 521613 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg)bin702432 -> 702432 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg)bin967695 -> 967695 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg)bin159004 -> 159004 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg)bin121195 -> 121195 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg)bin191332 -> 191332 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg)bin255434 -> 255434 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg)bin177952 -> 177952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg)bin141450 -> 141450 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg)bin149242 -> 149242 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg)bin235425 -> 235425 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg)bin194279 -> 194279 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg)bin240472 -> 240472 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg)bin341441 -> 341441 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg)bin308744 -> 308744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg)bin253511 -> 253511 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg)bin364307 -> 364307 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg)bin294385 -> 294385 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg)bin356919 -> 356919 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg)bin532240 -> 532240 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg)bin564941 -> 564941 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/index.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/index.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_admin.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png)bin755 -> 755 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_away.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_away.png)bin473 -> 473 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_halfop.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png)bin751 -> 751 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_normal.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png)bin744 -> 744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_op.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_op.png)bin753 -> 753 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_owner.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png)bin740 -> 740 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_voice.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png)bin744 -> 744 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png)bin58313 -> 58313 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Preview.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Preview.png)bin143500 -> 143500 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/ksplash/ReadMe.txt (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Theme.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/ksplash/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg)bin44757 -> 44757 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg)bin258562 -> 258562 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg)bin299494 -> 299494 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png)bin465 -> 465 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png)bin2843 -> 2843 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png)bin1310 -> 1310 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png)bin27184 -> 27184 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-login.ogg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg)bin32397 -> 32397 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg)bin1804977 -> 1804977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-panel.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-panel.png)bin1373 -> 1373 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg)bin409496 -> 409496 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png)bin1157493 -> 1157493 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/metabar/background.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/background.png)bin78100 -> 78100 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/metabar/default.css (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/default.css)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/metabar/head.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/head.png)bin170 -> 170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/metabar/layout.html (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/layout.html)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png)bin50739 -> 50739 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png)bin470224 -> 470224 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/Dialog.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png)bin17219 -> 17219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_normal.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_over.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/gpl.txt (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/kubuntu.xml (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/kubuntu.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/preview.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png)bin470224 -> 470224 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_normal.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_over.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_pressed.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png)bin776 -> 776 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png)bin800 -> 800 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png)bin794 -> 794 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png)bin792 -> 792 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png)bin789 -> 789 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png)bin769 -> 769 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png)bin764 -> 764 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png)bin758 -> 758 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png)bin787 -> 787 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png)bin783 -> 783 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png)bin763 -> 763 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png)bin784 -> 784 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png)bin774 -> 774 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png)bin759 -> 759 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png)bin763 -> 763 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png)bin768 -> 768 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png)bin769 -> 769 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png)bin765 -> 765 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png)bin777 -> 777 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png)bin788 -> 788 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png)bin780 -> 780 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png)bin772 -> 772 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png)bin793 -> 793 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png)bin786 -> 786 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png)bin791 -> 791 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png)bin795 -> 795 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png)bin792 -> 792 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png)bin781 -> 781 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png)bin774 -> 774 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png)bin777 -> 777 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png)bin761 -> 761 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png)bin770 -> 770 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png)bin771 -> 771 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png)bin767 -> 767 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png)bin773 -> 773 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png)bin778 -> 778 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png)bin782 -> 782 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png)bin779 -> 779 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png)bin795 -> 795 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png)bin38288 -> 38288 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png)bin1199 -> 1199 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png)bin1188 -> 1188 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png)bin1195 -> 1195 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png)bin1203 -> 1203 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png)bin1181 -> 1181 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png)bin1190 -> 1190 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png)bin1155 -> 1155 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png)bin1183 -> 1183 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png)bin1189 -> 1189 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png)bin1209 -> 1209 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png)bin1185 -> 1185 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png)bin1184 -> 1184 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png)bin1177 -> 1177 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png)bin1163 -> 1163 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png)bin1163 -> 1163 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png)bin1190 -> 1190 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png)bin1170 -> 1170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png)bin1187 -> 1187 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png)bin1212 -> 1212 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png)bin1203 -> 1203 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png)bin1199 -> 1199 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png)bin1194 -> 1194 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png)bin1165 -> 1165 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png)bin1167 -> 1167 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png)bin1165 -> 1165 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png)bin1164 -> 1164 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png)bin1171 -> 1171 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png)bin1169 -> 1169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png)bin1182 -> 1182 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png)bin1198 -> 1198 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png)bin1193 -> 1193 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png)bin1185 -> 1185 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png)bin1177 -> 1177 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png)bin1215 -> 1215 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png)bin1196 -> 1196 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png)bin1219 -> 1219 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png)bin1179 -> 1179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png)bin1200 -> 1200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png)bin1189 -> 1189 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png)bin1174 -> 1174 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png)bin1161 -> 1161 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png)bin1191 -> 1191 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png)bin1172 -> 1172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png)bin1172 -> 1172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png)bin1160 -> 1160 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png)bin1164 -> 1164 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png)bin1176 -> 1176 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png)bin1192 -> 1192 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png)bin1173 -> 1173 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png)bin1186 -> 1186 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png)bin1178 -> 1178 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png)bin1170 -> 1170 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png)bin62916 -> 62916 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png)bin1967 -> 1967 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png)bin1987 -> 1987 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png)bin1980 -> 1980 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png)bin1963 -> 1963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png)bin1990 -> 1990 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png)bin1972 -> 1972 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png)bin1963 -> 1963 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png)bin1995 -> 1995 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png)bin1953 -> 1953 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png)bin1996 -> 1996 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png)bin1986 -> 1986 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png)bin1966 -> 1966 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png)bin1957 -> 1957 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png)bin1964 -> 1964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png)bin1971 -> 1971 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png)bin1975 -> 1975 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png)bin1946 -> 1946 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png)bin1949 -> 1949 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png)bin1973 -> 1973 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png)bin1980 -> 1980 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png)bin1992 -> 1992 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png)bin1965 -> 1965 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png)bin1959 -> 1959 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png)bin1932 -> 1932 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png)bin1938 -> 1938 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png)bin1921 -> 1921 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png)bin1923 -> 1923 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png)bin1922 -> 1922 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png)bin1912 -> 1912 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png)bin1933 -> 1933 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png)bin1911 -> 1911 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png)bin1942 -> 1942 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png)bin1969 -> 1969 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png)bin1952 -> 1952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png)bin1974 -> 1974 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png)bin1973 -> 1973 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png)bin1979 -> 1979 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png)bin1976 -> 1976 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png)bin1970 -> 1970 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png)bin1978 -> 1978 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png)bin1977 -> 1977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png)bin1992 -> 1992 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png)bin1994 -> 1994 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png)bin1977 -> 1977 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png)bin1994 -> 1994 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png)bin1985 -> 1985 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png)bin1964 -> 1964 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png)bin1936 -> 1936 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png)bin1935 -> 1935 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png)bin1965 -> 1965 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png)bin1975 -> 1975 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png)bin1956 -> 1956 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png)bin1962 -> 1962 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png)bin1961 -> 1961 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png)bin1968 -> 1968 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png)bin1952 -> 1952 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png)bin1955 -> 1955 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png)bin1936 -> 1936 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png)bin1943 -> 1943 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png)bin1956 -> 1956 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png)bin108843 -> 108843 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png)bin3068 -> 3068 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png)bin3135 -> 3135 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png)bin3154 -> 3154 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png)bin3200 -> 3200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png)bin3128 -> 3128 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png)bin3167 -> 3167 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png)bin3158 -> 3158 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png)bin3149 -> 3149 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png)bin3083 -> 3083 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png)bin3069 -> 3069 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png)bin3061 -> 3061 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png)bin3129 -> 3129 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png)bin3089 -> 3089 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png)bin3114 -> 3114 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png)bin3086 -> 3086 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png)bin3077 -> 3077 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png)bin3082 -> 3082 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png)bin3064 -> 3064 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png)bin3084 -> 3084 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png)bin3087 -> 3087 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png)bin3052 -> 3052 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png)bin3111 -> 3111 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png)bin3140 -> 3140 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png)bin3138 -> 3138 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png)bin3188 -> 3188 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png)bin3200 -> 3200 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png)bin3144 -> 3144 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png)bin3159 -> 3159 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png)bin3145 -> 3145 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png)bin3157 -> 3157 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png)bin3113 -> 3113 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png)bin3029 -> 3029 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png)bin3026 -> 3026 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png)bin3050 -> 3050 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png)bin3036 -> 3036 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png)bin3053 -> 3053 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png)bin3057 -> 3057 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png)bin3082 -> 3082 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png)bin3099 -> 3099 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png)bin3081 -> 3081 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png)bin3141 -> 3141 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png)bin3139 -> 3139 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png)bin3101 -> 3101 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png)bin3066 -> 3066 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png)bin3095 -> 3095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png)bin3109 -> 3109 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png)bin3134 -> 3134 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png)bin3160 -> 3160 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png)bin3206 -> 3206 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png)bin3247 -> 3247 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png)bin3211 -> 3211 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png)bin3169 -> 3169 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png)bin3183 -> 3183 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png)bin3172 -> 3172 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png)bin3120 -> 3120 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png)bin3048 -> 3048 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png)bin3038 -> 3038 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png)bin3059 -> 3059 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png)bin3126 -> 3126 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png)bin3115 -> 3115 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png)bin3095 -> 3095 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png)bin3073 -> 3073 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png)bin3096 -> 3096 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png)bin3091 -> 3091 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png)bin3079 -> 3079 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png)bin3037 -> 3037 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png)bin3022 -> 3022 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png)bin3001 -> 3001 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png)bin3037 -> 3037 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png)bin3079 -> 3079 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/trinity.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png)bin164940 -> 164940 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/throbber/gear.3ds (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/gear.3ds)bin993179 -> 993179 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient-inactive.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png)bin196 -> 196 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png)bin322 -> 322 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/backgroundrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/backgroundrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/circle (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/copy (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crosshair (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dot (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dotbox (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_large (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_small (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draped_box (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fleur (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand1 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand2 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_side (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/link (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/move (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pencil (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pirate (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/plus (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_side (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/tcross (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_side (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/watch (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large)bin5248 -> 5248 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/cursors/index.theme (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/index.theme)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/compat2
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/control3
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/distrospecific/.gitignore0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/default-icon-positions/IconPositions (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/default-icon-positions/IconPositions)0
-rwxr-xr-xdebian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen128.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen128.png)bin7355 -> 7355 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen64.png (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen64.png)bin3305 -> 3305 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kaffeine/wizard_stamp_v0.7.10
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-home (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-home)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-media (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-hidden/hidden-media (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/hidden-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_managerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_notifierrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/amarokrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/amarokrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/arkrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/arkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/cryptodefaults (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/d3lphinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc-2.0 (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3b.eventsrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3brc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3brc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kaffeinerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/katapultrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katapultrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/katerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kbookmarkrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmlaptoprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmnspluginrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcookiejarrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdesktoprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kgpgrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kgpgrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/khelpcenterrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/klipperrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/klipperrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmailrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmailrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmixrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmixrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmplayerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/knemorc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knemorc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotesrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotesrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotify.eventsrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/konqiconviewrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/konquerorrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konquerorrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/konsolerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konsolerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kontactrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kontactrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/konversationrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konversationrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kopeterc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kopeterc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/korgacrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/korgacrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kscdrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kscdrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/ksplashrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ksplashrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktaskbarrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktiprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktiprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuriikwsfilterrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuserrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuserrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/metabarrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/metabarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/profilerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/skimrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/skimrc)0
-rwxr-xr-xdebian/_base/metapackages/redmond-default-settings/kde-rc-files/startupconfig (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/startupconfig)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdehtmlrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdeio_httprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdelaunchrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdewalletrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/twincrystalrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/twinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/uiserver (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/uiserver)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde-rc-files/yakuakerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/yakuakerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/colors (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-home (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-media (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/hidden-media (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/cryptodefaults (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/dolphinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/katerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcminputrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kdeglobals (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kmixrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/ktiprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kuserrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kwinrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdewalletrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kickerrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kickerrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/compton-tde.conf (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/xcompmgrrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/konqueror-profile/konq_plugins.xml (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-plugins/dirfilterplugin.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/gvimagepart.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ksvgplugin.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/part.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/part.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-7z.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-7z.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-ace.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-ace.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-arc.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arc.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-archive.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-archive.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-arj.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arj.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip2.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-compress.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-compress.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-cpio.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-gzip.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-lha.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lha.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-lzop.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-pak.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-pak.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-rar.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-rar.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-tar.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tar.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-tarz.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-tbz.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-tgz.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-tzo.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-zip.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zip.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/mimelnk/x-zoo.desktop (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/qt-rc-files/kstylerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/kstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/qt-rc-files/lipstikstylerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/qt-rc-files/polyesterstylerc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/tde-profile/kde4rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/kde4rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/tde-profile/tde-user-profile (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tde-user-profile)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/tde-profile/tderc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tderc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl)bin148 -> 148 bytes
-rw-r--r--debian/_base/metapackages/redmond-default-settings/tdmdistrc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdmdistrc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/ui-rc-files/gwenviewui.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/ui-rc-files/konqueror.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc)0
-rw-r--r--debian/_base/metapackages/redmond-default-settings/ui-rc-files/kopetechatwindow.rc (renamed from debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc)0
-rw-r--r--debian/_base/metapackages/sudo-trinity/debian/compat2
-rw-r--r--debian/_base/metapackages/sudo-trinity/debian/control2
-rw-r--r--debian/_base/metapackages/synaptic-trinity/debian/compat2
-rw-r--r--debian/_base/metapackages/synaptic-trinity/debian/control2
-rw-r--r--debian/_base/metapackages/trinity-apt-archive/debian/compat2
-rw-r--r--debian/_base/metapackages/trinity-apt-archive/debian/control4
-rw-r--r--debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list4
-rwxr-xr-xdebian/_base/metapackages/trinity-apt-archive/debian/rules3
-rw-r--r--debian/_base/metapackages/trinity-keyring/debian/compat2
-rw-r--r--debian/_base/metapackages/trinity-keyring/debian/control2
-rw-r--r--debian/_base/metapackages/trinity-slax/debian/compat2
-rw-r--r--debian/_base/metapackages/trinity-slax/debian/control2
2439 files changed, 6593 insertions, 7673 deletions
diff --git a/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/kdbg/debian/compat b/debian/_base/applications/development/kdbg/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kdbg/debian/compat
+++ b/debian/_base/applications/development/kdbg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kdbg/debian/control b/debian/_base/applications/development/kdbg/debian/control
index 2df63bacd..e32f49776 100644
--- a/debian/_base/applications/development/kdbg/debian/control
+++ b/debian/_base/applications/development/kdbg/debian/control
@@ -2,7 +2,7 @@ Source: kdbg-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://www.kdbg.org/
diff --git a/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/kdiff3/debian/compat b/debian/_base/applications/development/kdiff3/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kdiff3/debian/compat
+++ b/debian/_base/applications/development/kdiff3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kdiff3/debian/control b/debian/_base/applications/development/kdiff3/debian/control
index aa61b7242..a1fb7a152 100644
--- a/debian/_base/applications/development/kdiff3/debian/control
+++ b/debian/_base/applications/development/kdiff3/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Eike Sauer <eike@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev
Standards-Version: 3.8.4
Package: kdiff3-trinity
diff --git a/debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/kpicosim/debian/compat b/debian/_base/applications/development/kpicosim/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kpicosim/debian/compat
+++ b/debian/_base/applications/development/kpicosim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kpicosim/debian/control b/debian/_base/applications/development/kpicosim/debian/control
index e73064484..09a9a6597 100644
--- a/debian/_base/applications/development/kpicosim/debian/control
+++ b/debian/_base/applications/development/kpicosim/debian/control
@@ -2,7 +2,7 @@ Source: kpicosim-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kpicosim-trinity
diff --git a/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/kscope/debian/compat b/debian/_base/applications/development/kscope/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kscope/debian/compat
+++ b/debian/_base/applications/development/kscope/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kscope/debian/control b/debian/_base/applications/development/kscope/debian/control
index 24cae5f83..73542706b 100644
--- a/debian/_base/applications/development/kscope/debian/control
+++ b/debian/_base/applications/development/kscope/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bison, flex, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bison, flex, tdebase-trinity-dev
Standards-Version: 3.8.0
Homepage: http://kscope.sourceforge.net
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
diff --git a/debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/ktechlab/debian/compat b/debian/_base/applications/development/ktechlab/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/ktechlab/debian/compat
+++ b/debian/_base/applications/development/ktechlab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/ktechlab/debian/control b/debian/_base/applications/development/ktechlab/debian/control
index 987d45194..d57423bb4 100644
--- a/debian/_base/applications/development/ktechlab/debian/control
+++ b/debian/_base/applications/development/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2)
Standards-Version: 3.8.4
Package: ktechlab-trinity
diff --git a/debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/kxmleditor/debian/compat b/debian/_base/applications/development/kxmleditor/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kxmleditor/debian/compat
+++ b/debian/_base/applications/development/kxmleditor/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kxmleditor/debian/control b/debian/_base/applications/development/kxmleditor/debian/control
index 1486106b3..0047dbbc0 100644
--- a/debian/_base/applications/development/kxmleditor/debian/control
+++ b/debian/_base/applications/development/kxmleditor/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.0
Package: kxmleditor-trinity
diff --git a/debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/piklab/debian/compat b/debian/_base/applications/development/piklab/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/piklab/debian/compat
+++ b/debian/_base/applications/development/piklab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control
index b95c0076e..733219472 100644
--- a/debian/_base/applications/development/piklab/debian/control
+++ b/debian/_base/applications/development/piklab/debian/control
@@ -2,7 +2,7 @@ Source: piklab-trinity
Section: electronics
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, quilt, chrpath,
+Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath,
libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://piklab.sourceforge.net/
diff --git a/debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/development/tdesvn/debian/compat b/debian/_base/applications/development/tdesvn/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/tdesvn/debian/compat
+++ b/debian/_base/applications/development/tdesvn/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/tdesvn/debian/control b/debian/_base/applications/development/tdesvn/debian/control
index 97024ba8b..153acb107 100644
--- a/debian/_base/applications/development/tdesvn/debian/control
+++ b/debian/_base/applications/development/tdesvn/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
Standards-Version: 3.8.4
Package: libsvnqt4-trinity
diff --git a/debian/_base/applications/development/tdesvn/debian/docs b/debian/_base/applications/development/tdesvn/debian/docs
index ca0272abf..0b6e0f321 100644
--- a/debian/_base/applications/development/tdesvn/debian/docs
+++ b/debian/_base/applications/development/tdesvn/debian/docs
@@ -1,3 +1,2 @@
AUTHORS
-README
-TODO
+README.md
diff --git a/debian/_base/applications/development/tdesvn/debian/man/tdesvn.1 b/debian/_base/applications/development/tdesvn/debian/man/tdesvn.1
deleted file mode 100644
index 7a4db503b..000000000
--- a/debian/_base/applications/development/tdesvn/debian/man/tdesvn.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH TDESVN 1 "Dez 2005" "Trinity Desktop Environment" "A Subversion Client for TDE (standalone application)"
-.SH NAME
-tdesvn
-\- A Subversion client for TDE (standalone application)
-.SH SYNOPSIS
-tdesvn [Qt\-options] [TDE\-options] [options] exec <command> [URL]
-.SH DESCRIPTION
-A Subversion client for TDE (standalone application)
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B exec
-<command> Execute subversion command ("exec help" for more information, opens TDE Help Center)
-.TP
-.B URL
-Path to local working copy or a repository.
-.SS Options:
-.TP
-.B \-r startrev
-[:endrev] Execute single subversion command on specific revision(-range)
-.TP
-.B \-R
-Ask for revision when executing single command
-.TP
-.B \-o <file>
-Save output of subversion command (eg "cat") into file <file>
-.TP
-.B \-l <number>
-Limit log output to <number>
-.SS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH EXAMPLE
-tdesvn file:///path/to/local/working/copy
-.br
-tdesvn http://remote/svn/project/trunk
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdesvn/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/tdesvn/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Rajko Albrecht <ral@alwins-world.de>
-.br
-
diff --git a/debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1 b/debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
deleted file mode 100644
index e19bcaf04..000000000
--- a/debian/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH TDESVNASKPASS 1 "Aug 2005" "Trinity Desktop Environment" "ssh-askpass for tdesvn"
-.SH NAME
-tdesvnaskpass
-\- ssh-askpass for tdesvn
-.SH SYNOPSIS
-tdesvnaskpass [Qt\-options] [TDE\-options] [prompt]
-.SH DESCRIPTION
-ssh-askpass for tdesvn.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B prompt
-Prompt that is displayed to the user.
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-.BR tdesvn(1)
-.br
-.SH AUTHORS
-.nf
-Rajko Albrecht <ral@alwins-world.de>
-.br
-
diff --git a/debian/_base/applications/development/tdesvn/debian/rules b/debian/_base/applications/development/tdesvn/debian/rules
index e56464216..219eeb56e 100755
--- a/debian/_base/applications/development/tdesvn/debian/rules
+++ b/debian/_base/applications/development/tdesvn/debian/rules
@@ -35,4 +35,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
binary-install/tdesvn-trinity::
# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
index 8903355a2..7dc6dca33 100644
--- a/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
+++ b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.install
@@ -11,4 +11,4 @@ debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
debian/tmp/opt/trinity/share/config.kcfg/
debian/tmp/opt/trinity/share/applications/tde/*.desktop
debian/tmp/opt/trinity/share/doc/tde/
-
+debian/tmp/opt/trinity/share/man/
diff --git a/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages b/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
deleted file mode 100644
index 8cb778203..000000000
--- a/debian/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdesvn.1
-debian/man/tdesvnaskpass.1
diff --git a/debian/_base/applications/development/tdesvn/debian/watch b/debian/_base/applications/development/tdesvn/debian/watch
deleted file mode 100644
index 80c0f090c..000000000
--- a/debian/_base/applications/development/tdesvn/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://tdesvn.alwins-world.de/trac.fcgi/wiki/DownLoads .*tdesvn-(.*)\.tar\.bz2
diff --git a/debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk b/debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/games/knights/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/games/knights/debian/compat b/debian/_base/applications/games/knights/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/games/knights/debian/compat
+++ b/debian/_base/applications/games/knights/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/games/knights/debian/control b/debian/_base/applications/games/knights/debian/control
index 97888866c..f8512b220 100644
--- a/debian/_base/applications/games/knights/debian/control
+++ b/debian/_base/applications/games/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://knights.sourceforge.net/
diff --git a/debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk b/debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/games/tdepacman/debian/compat b/debian/_base/applications/games/tdepacman/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/games/tdepacman/debian/compat
+++ b/debian/_base/applications/games/tdepacman/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/games/tdepacman/debian/control b/debian/_base/applications/games/tdepacman/debian/control
index 95a24c9ca..2039eefb8 100644
--- a/debian/_base/applications/games/tdepacman/debian/control
+++ b/debian/_base/applications/games/tdepacman/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev
Standards-Version: 0.3.2
Package: tdepacman-trinity
diff --git a/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/graphics/digikam/debian/compat b/debian/_base/applications/graphics/digikam/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/graphics/digikam/debian/compat
+++ b/debian/_base/applications/graphics/digikam/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/graphics/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control
index 3d2a0cc39..9a0ce57b7 100644
--- a/debian/_base/applications/graphics/digikam/debian/control
+++ b/debian/_base/applications/graphics/digikam/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev,
libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
libjasper-dev, libpng-dev, libexiv2-dev,
diff --git a/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/graphics/gwenview-i18n/debian/compat b/debian/_base/applications/graphics/gwenview-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/graphics/gwenview-i18n/debian/compat
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/graphics/gwenview-i18n/debian/control b/debian/_base/applications/graphics/gwenview-i18n/debian/control
index 32ea8025c..b292db694 100644
--- a/debian/_base/applications/graphics/gwenview-i18n/debian/control
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
Standards-Version: 3.8.0
Homepage: http://gwenview.sourceforge.net
@@ -13,5 +13,5 @@ Depends: gwenview-trinity (>= 1.4.2)
Replaces: gwenview-trinity (<< 1.4.0-1)
Description: Internationalization (i18n) for Gwenview, an image viewer for TDE
This package provides internationalization (i18n) files (translations) for
- Gwenview, an image viewer for the Trinity Desktop Environment. See the 'gwenview'
- package description for more information.
+ Gwenview, an image viewer for the Trinity Desktop Environment. See the
+ 'gwenview-trinity' package description for more information.
diff --git a/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/graphics/gwenview/debian/compat b/debian/_base/applications/graphics/gwenview/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/graphics/gwenview/debian/compat
+++ b/debian/_base/applications/graphics/gwenview/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/graphics/gwenview/debian/control b/debian/_base/applications/graphics/gwenview/debian/control
index 00f0d6e8b..4454c3137 100644
--- a/debian/_base/applications/graphics/gwenview/debian/control
+++ b/debian/_base/applications/graphics/gwenview/debian/control
@@ -2,9 +2,9 @@ Source: gwenview-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ libkipi0-trinity-dev, libexiv2-dev, libmng-dev, libxcursor-dev
Standards-Version: 3.8.4
-Homepage: http://gwenview.sourceforge.net
Package: gwenview-trinity
Architecture: any
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}
Replaces: gwenview-trinity (<< 4:14.0.0~)
Breaks: gwenview-trinity (<< 4:14.0.0~)
Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity
-Suggests: gwenview-i18n
+Suggests: gwenview-i18n-trinity
Description: image viewer for TDE
Gwenview is an image viewer for the Trinity Desktop Environment. It features a
folder tree window and a file list window to provide easy navigation of your
@@ -29,5 +29,5 @@ Description: image viewer for TDE
package. The ability to perform lossless JPEG transforms is built in.
.
Gwenview's internationalization files (i18n) (translations) are available
- in the gwenview-i18n package. Users with non-US English desktops should
- install this package.
+ in the gwenview-i18n-trinity package. Users with non-US English desktops
+ should install this package.
diff --git a/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
deleted file mode 100644
index 931c8d219..000000000
--- a/debian/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: gwenview-trinity
-Title: Gwenview Handbook
-Author: Aurélien Gâteau, Christopher Martin, The TDE Team
-Abstract: Gwenview is an image viewer for TDE.
-Section: Viewers
-
-Format: HTML
-Index: /opt/trinity/share/doc/tde/HTML/en/gwenview/index.html
-Files: /opt/trinity/share/doc/tde/HTML/en/gwenview/*.html
diff --git a/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian b/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
deleted file mode 100644
index 0e247a6ab..000000000
--- a/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm b/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
deleted file mode 100644
index 076efa834..000000000
--- a/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
+++ /dev/null
@@ -1,554 +0,0 @@
-/* XPM */
-static char * gwenview_xpm[] = {
-"32 32 519 2",
-" c None",
-". c #2D2F32",
-"+ c #3A3C3F",
-"@ c #3C3F42",
-"# c #333538",
-"$ c #5F6164",
-"% c #A0A2A4",
-"& c #CCCDCF",
-"* c #E3E4E5",
-"= c #ECEDEE",
-"- c #EEEFEF",
-"; c #E8E9EA",
-"> c #D7D8DA",
-", c #B4B6B8",
-"' c #7B7D80",
-") c #383A3D",
-"! c #6D7073",
-"~ c #CBCDCF",
-"{ c #F6F7F8",
-"] c #FEFFFF",
-"^ c #FEFEFE",
-"/ c #FCFDFE",
-"( c #FCFDFD",
-"_ c #FDFEFE",
-": c #E5E6E7",
-"< c #9DA0A2",
-"[ c #36383B",
-"} c #323539",
-"| c #ADB0B3",
-"1 c #F3F5F7",
-"2 c #FAFCFD",
-"3 c #F7F9FA",
-"4 c #F8FAFB",
-"5 c #D7DADC",
-"6 c #616468",
-"7 c #3E4145",
-"8 c #C6CACE",
-"9 c #F6F9FB",
-"0 c #F3F7F8",
-"a c #F3F6F8",
-"b c #F5F9FA",
-"c c #E6EAEC",
-"d c #74787C",
-"e c #32363A",
-"f c #C0C7CB",
-"g c #F1F6F8",
-"h c #EFF3F6",
-"i c #F0F5F7",
-"j c #E3E9EC",
-"k c #676C71",
-"l c #A2AAAF",
-"m c #EBF2F6",
-"n c #EDF3F6",
-"o c #EEF4F7",
-"p c #EFF5F7",
-"q c #EFF4F7",
-"r c #EEF4F6",
-"s c #EDF2F5",
-"t c #ECF1F4",
-"u c #EBF0F3",
-"v c #EBF0F4",
-"w c #ECF0F4",
-"x c #ECF1F5",
-"y c #EDF2F6",
-"z c #EEF3F7",
-"A c #EFF4F8",
-"B c #D1D9DD",
-"C c #42474B",
-"D c #686F73",
-"E c #D5DFE3",
-"F c #D1D8DB",
-"G c #C2C7CB",
-"H c #B1B5BA",
-"I c #A1A6AC",
-"J c #949AA0",
-"K c #899298",
-"L c #828D92",
-"M c #7D8C8E",
-"N c #798A8A",
-"O c #778985",
-"P c #778982",
-"Q c #788A7F",
-"R c #7A8B7E",
-"S c #7F8E82",
-"T c #869288",
-"U c #8F9991",
-"V c #9AA29D",
-"W c #A7AEAC",
-"X c #B6BCBD",
-"Y c #C7CCCF",
-"Z c #D4DCE1",
-"` c #A0A8AE",
-" . c #110D12",
-".. c #665A69",
-"+. c #7E6B83",
-"@. c #7F6C87",
-"#. c #877993",
-"$. c #928AA3",
-"%. c #9E9DB2",
-"&. c #AAAFBF",
-"*. c #B5C0CA",
-"=. c #BECCD2",
-"-. c #C4D6D8",
-";. c #C8DCDA",
-">. c #CADED7",
-",. c #CBDFD3",
-"'. c #C9DECD",
-"). c #C5DBC5",
-"!. c #C1D6BE",
-"~. c #BBCFB5",
-"{. c #B4C7A9",
-"]. c #AABB9A",
-"^. c #9FAD8A",
-"/. c #939E79",
-"(. c #888F6B",
-"_. c #808465",
-":. c #787965",
-"<. c #2F2D26",
-"[. c #724051",
-"}. c #AF889E",
-"|. c #D8B3D1",
-"1. c #ECCEED",
-"2. c #F4E1FA",
-"3. c #F7ECFE",
-"4. c #F6F0FF",
-"5. c #F3F2FF",
-"6. c #F1F5FF",
-"7. c #EEF7FF",
-"8. c #ECFAFF",
-"9. c #E9FDFF",
-"0. c #E7FFFC",
-"a. c #E6FFF6",
-"b. c #E4FFF0",
-"c. c #E3FFE9",
-"d. c #E3FFE3",
-"e. c #E6FFE2",
-"f. c #E9FFE1",
-"g. c #ECFFE0",
-"h. c #EFFFDF",
-"i. c #F3FFDD",
-"j. c #F5FFDA",
-"k. c #F6FED3",
-"l. c #F4F7C7",
-"m. c #EAE4B6",
-"n. c #CFBE9B",
-"o. c #A68269",
-"p. c #3F1E13",
-"q. c #6C2632",
-"r. c #FCC0D2",
-"s. c #FDD7EE",
-"t. c #FFD4F8",
-"u. c #FCCEFD",
-"v. c #F3CEFE",
-"w. c #EAD0FE",
-"x. c #E1D2FE",
-"y. c #D7D5FE",
-"z. c #D2DCFE",
-"A. c #CDE5FE",
-"B. c #C9EFFE",
-"C. c #C5F8FD",
-"D. c #C2FDF6",
-"E. c #C1FEE8",
-"F. c #C0FEDA",
-"G. c #BFFECB",
-"H. c #BFFEBF",
-"I. c #C5FEBD",
-"J. c #CCFEBC",
-"K. c #D2FEBB",
-"L. c #DAFEBA",
-"M. c #E1FEB8",
-"N. c #E9FEB7",
-"O. c #F1FEB7",
-"P. c #F9FEB6",
-"Q. c #FEF7BA",
-"R. c #FDE8BF",
-"S. c #FDD8BE",
-"T. c #B96B57",
-"U. c #A44855",
-"V. c #FBB9CF",
-"W. c #F8B6DD",
-"X. c #FDB2EF",
-"Y. c #FAACFC",
-"Z. c #EDAFFE",
-"`. c #DEB4FE",
-" + c #CFB8FE",
-".+ c #C0BDFE",
-"++ c #B8C9FE",
-"@+ c #B2D7FE",
-"#+ c #ABE6FE",
-"$+ c #A5F6FD",
-"%+ c #A1FDF2",
-"&+ c #A0FEDD",
-"*+ c #9FFEC6",
-"=+ c #9DFEB0",
-"-+ c #9FFE9E",
-";+ c #A8FE9B",
-">+ c #B3FE9A",
-",+ c #BDFE99",
-"'+ c #C8FE98",
-")+ c #D3FE97",
-"!+ c #DFFE96",
-"~+ c #EBFE95",
-"{+ c #F7FD94",
-"]+ c #FDF297",
-"^+ c #FBDC9F",
-"/+ c #F4C39F",
-"(+ c #DC816C",
-"_+ c #220502",
-":+ c #B24A58",
-"<+ c #F69ABA",
-"[+ c #F899D1",
-"}+ c #FD92E9",
-"|+ c #F88BFB",
-"1+ c #E68FFE",
-"2+ c #D196FE",
-"3+ c #BC9DFE",
-"4+ c #A9A4FD",
-"5+ c #9DB5FE",
-"6+ c #95C9FE",
-"7+ c #8CDEFE",
-"8+ c #83F2FD",
-"9+ c #7EFDEE",
-"0+ c #7DFED1",
-"a+ c #7CFEB3",
-"b+ c #7BFE94",
-"c+ c #7DFD7D",
-"d+ c #8AFE79",
-"e+ c #99FE78",
-"f+ c #A8FE77",
-"g+ c #B7FE75",
-"h+ c #C5FE74",
-"i+ c #D5FE73",
-"j+ c #E4FE72",
-"k+ c #F5FD71",
-"l+ c #FDEE77",
-"m+ c #FBD282",
-"n+ c #EFAF7F",
-"o+ c #E1765D",
-"p+ c #2A0704",
-"q+ c #AB3849",
-"r+ c #F278A2",
-"s+ c #F67CC5",
-"t+ c #FD72E3",
-"u+ c #F669FB",
-"v+ c #DF6FFE",
-"w+ c #C578FE",
-"x+ c #AA81FD",
-"y+ c #918BFE",
-"z+ c #819FFC",
-"A+ c #74B5F5",
-"B+ c #6CD3FC",
-"C+ c #62F0FD",
-"D+ c #5CFDEA",
-"E+ c #5BFEC5",
-"F+ c #5AFE9F",
-"G+ c #58FE78",
-"H+ c #5CFE5B",
-"I+ c #6CFD56",
-"J+ c #7CF653",
-"K+ c #8FF853",
-"L+ c #A5FE53",
-"M+ c #B8FD52",
-"N+ c #CBFE51",
-"O+ c #DEFE50",
-"P+ c #F2FD4F",
-"Q+ c #FCEA56",
-"R+ c #FAC864",
-"S+ c #EB9A5E",
-"T+ c #D75E3F",
-"U+ c #210502",
-"V+ c #8F1F32",
-"W+ c #EF5488",
-"X+ c #F45FB8",
-"Y+ c #FC53DD",
-"Z+ c #F548FA",
-"`+ c #D850FE",
-" @ c #B95BFE",
-".@ c #9866FE",
-"+@ c #7770F8",
-"@@ c #506AC1",
-"#@ c #3B6FA2",
-"$@ c #3C9DC1",
-"%@ c #40E8F8",
-"&@ c #3BFEE6",
-"*@ c #3AFEBA",
-"=@ c #39FE8C",
-"-@ c #37FE5D",
-";@ c #3CFE3B",
-">@ c #44DA2F",
-",@ c #43A623",
-"'@ c #56AE24",
-")@ c #88E92F",
-"!@ c #ABFE31",
-"~@ c #C2FE30",
-"{@ c #D9FE2F",
-"]@ c #F1FD2E",
-"^@ c #FCE636",
-"/@ c #F8BC45",
-"(@ c #E7833C",
-"_@ c #BB401D",
-":@ c #5C091A",
-"<@ c #E92B6C",
-"[@ c #F13FA8",
-"}@ c #FC34D7",
-"|@ c #F427F9",
-"1@ c #D131FE",
-"2@ c #AC3EFE",
-"3@ c #864BFF",
-"4@ c #5A50E8",
-"5@ c #2D4696",
-"6@ c #22588E",
-"7@ c #1B7495",
-"8@ c #1DD7E7",
-"9@ c #19FEE3",
-"0@ c #18FEAE",
-"a@ c #17FE78",
-"b@ c #15FE42",
-"c@ c #1BFB19",
-"d@ c #21AF0D",
-"e@ c #2A8D0A",
-"f@ c #388D09",
-"g@ c #67C60D",
-"h@ c #9EFF10",
-"i@ c #B8FE0F",
-"j@ c #D3FE0E",
-"k@ c #EEFD0E",
-"l@ c #FCE318",
-"m@ c #F5B027",
-"n@ c #E56D19",
-"o@ c #7C2304",
-"p@ c #1C0006",
-"q@ c #BD084A",
-"r@ c #F02099",
-"s@ c #FD1AD4",
-"t@ c #F20CF9",
-"u@ c #CC18FE",
-"v@ c #A327FE",
-"w@ c #7836FE",
-"x@ c #4D44F5",
-"y@ c #2949B4",
-"z@ c #195998",
-"A@ c #1288B4",
-"B@ c #0BE0F4",
-"C@ c #04FEE1",
-"D@ c #03FFA9",
-"E@ c #03FF6E",
-"F@ c #03FE34",
-"G@ c #0AFE08",
-"H@ c #1BCF01",
-"I@ c #279B01",
-"J@ c #3BA101",
-"K@ c #6DE102",
-"L@ c #98FF02",
-"M@ c #B4FD02",
-"N@ c #D1FE02",
-"O@ c #EFFE02",
-"P@ c #FEE50E",
-"Q@ c #EAA419",
-"R@ c #944609",
-"S@ c #1B0700",
-"T@ c #2D0012",
-"U@ c #9B0E63",
-"V@ c #E810C1",
-"W@ c #F206F8",
-"X@ c #CE14FF",
-"Y@ c #A324FF",
-"Z@ c #7734FF",
-"`@ c #4E45FF",
-" # c #3765F8",
-".# c #2689EC",
-"+# c #19BBF9",
-"@# c #09E9FD",
-"## c #00E5CA",
-"$# c #02C381",
-"%# c #02BF52",
-"&# c #00DD29",
-"*# c #08FB06",
-"=# c #24FD02",
-"-# c #3CF002",
-";# c #59F302",
-"># c #7BFE02",
-",# c #9AFF02",
-"'# c #B7FF02",
-")# c #CDFA00",
-"!# c #D4E200",
-"~# c #B0A00C",
-"{# c #614C1A",
-"]# c #0F0A06",
-"^# c #161117",
-"/# c #6A3C67",
-"(# c #88208E",
-"_# c #8C13AF",
-":# c #801CCB",
-"<# c #652ADE",
-"[# c #443CE7",
-"}# c #315EEA",
-"|# c #2284E6",
-"1# c #139CD2",
-"2# c #128E9D",
-"3# c #4A7E7C",
-"4# c #869796",
-"5# c #8B9A98",
-"6# c #52785B",
-"7# c #1B891A",
-"8# c #1CBD03",
-"9# c #34D300",
-"0# c #4CD400",
-"a# c #60CA00",
-"b# c #6EB804",
-"c# c #749E10",
-"d# c #73862A",
-"e# c #797F57",
-"f# c #7D807B",
-"g# c #494D52",
-"h# c #7B8487",
-"i# c #BFCACB",
-"j# c #9FA4AA",
-"k# c #858294",
-"l# c #706C89",
-"m# c #606285",
-"n# c #586584",
-"o# c #5C7185",
-"p# c #73858E",
-"q# c #A7AEB2",
-"r# c #DAE0E5",
-"s# c #E5EDF2",
-"t# c #DBE3E8",
-"u# c #BABDC2",
-"v# c #B1B5BB",
-"w# c #8D9B95",
-"x# c #798E7B",
-"y# c #7A8D79",
-"z# c #859385",
-"A# c #97A09D",
-"B# c #B0B6BC",
-"C# c #CAD1DA",
-"D# c #C7CED4",
-"E# c #9A9EA1",
-"F# c #242629",
-"G# c #2A2D31",
-"H# c #BFC7CC",
-"I# c #E6F0F5",
-"J# c #E3EDF1",
-"K# c #E1EBEE",
-"L# c #DFE8EB",
-"M# c #DEE6E9",
-"N# c #E0E8EC",
-"O# c #E3EBF0",
-"P# c #E3ECF2",
-"Q# c #E1EAEF",
-"R# c #E0E9EE",
-"S# c #D6DEE3",
-"T# c #D8E0E4",
-"U# c #E2EBF0",
-"V# c #E4EDF2",
-"W# c #E3EBF2",
-"X# c #E4ECF2",
-"Y# c #E4EDF3",
-"Z# c #E3ECF1",
-"`# c #CED5D9",
-" $ c #ADB1B3",
-".$ c #53565A",
-"+$ c #505559",
-"@$ c #D1DADF",
-"#$ c #E1E9EE",
-"$$ c #DEE7EC",
-"%$ c #C6CDD0",
-"&$ c #AFB3B5",
-"*$ c #73777A",
-"=$ c #62666B",
-"-$ c #D3DBE0",
-";$ c #E4ECF1",
-">$ c #E2EAEF",
-",$ c #D8DFE3",
-"'$ c #C5CBCE",
-")$ c #BDC2C5",
-"!$ c #BCC1C4",
-"~$ c #C1C6C9",
-"{$ c #D1D8DC",
-"]$ c #E0E8ED",
-"^$ c #C5CACD",
-"/$ c #AEB1B3",
-"($ c #7D8083",
-"_$ c #565B5F",
-":$ c #C4CBD1",
-"<$ c #E2EBEF",
-"[$ c #CFD5D9",
-"}$ c #CDD3D6",
-"|$ c #D5DCE0",
-"1$ c #DFE6EB",
-"2$ c #DEE6EB",
-"3$ c #C6CBCF",
-"4$ c #AAADAF",
-"5$ c #727578",
-"6$ c #33363A",
-"7$ c #D5DDE2",
-"8$ c #E1E8ED",
-"9$ c #D6DDE1",
-"0$ c #BBC0C3",
-"a$ c #939698",
-"b$ c #4F5255",
-"c$ c #42464A",
-"d$ c #898F94",
-"e$ c #BFC6CB",
-"f$ c #DCE4E8",
-"g$ c #DDE4E9",
-"h$ c #DAE2E6",
-"i$ c #D4DBDF",
-"j$ c #C7CDD0",
-"k$ c #AEB3B6",
-"l$ c #888C8E",
-"m$ c #55575A",
-"n$ c #414447",
-"o$ c #575A5E",
-"p$ c #626569",
-"q$ c #626568",
-"r$ c #575A5D",
-"s$ c #434548",
-"t$ c #292B2D",
-" ",
-" ",
-" ",
-" . + @ # ",
-" $ % & * = - ; > , ' ) ",
-" ! ~ { ] ^ / ( ( / _ ] ( : < [ ",
-" } | 1 2 3 3 3 3 3 3 3 3 3 3 4 2 5 6 ",
-" 7 8 9 0 a a a a a a a a a a a a a b c d ",
-" e f g h h h h h h h h h h h h h h h h i j k ",
-" l m n o p q r n s t u v w x y z o A o o o B C ",
-" D E F G H I J K L M N O P Q R S T U V W X Y Z ` ",
-" ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<. ",
-" [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p. ",
-" q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T. ",
-" U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+",
-" :+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+",
-" q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+",
-" V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@ ",
-" :@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@ ",
-" p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@ ",
-" T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]# ",
-" ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g# ",
-" h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F# ",
-" G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#W#X#Y#Z#`# $.$ ",
-" +$@$O##$Q#Q#Q#Q##$R##$Q#Q#R##$Q##$Q#$$%$&$*$ ",
-" =$-$;$Q##$Q#>$,$'$)$!$~${$#$>$>$]$^$/$($ ",
-" _$:$;$<$#$>$]$T#[$}$|$1$>$>$2$3$4$5$ ",
-" 6$J 7$;$;$>$U#O#O#O#O#8$9$0$a$b$ ",
-" c$d$e$S#f$g$h$i$j$k$l$m$ ",
-" n$o$p$q$r$s$t$ ",
-" ",
-" "};
diff --git a/debian/_base/applications/graphics/gwenview/debian/rules b/debian/_base/applications/graphics/gwenview/debian/rules
index 4f8a32879..f8596e545 100755
--- a/debian/_base/applications/graphics/gwenview/debian/rules
+++ b/debian/_base/applications/graphics/gwenview/debian/rules
@@ -1,44 +1,19 @@
-#! /usr/bin/make -f
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
+#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-DEB_INSTALL_DOCS_ALL :=
-DEB_INSTALL_CHANGELOGS_ALL := NEWS
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-install/gwenview-trinity::
- install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm
- install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-
- cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \
- /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/compat b/debian/_base/applications/graphics/ksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/graphics/ksquirrel/debian/compat
+++ b/debian/_base/applications/graphics/ksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/control b/debian/_base/applications/graphics/ksquirrel/debian/control
index 4b72b4c75..12f2c5fab 100644
--- a/debian/_base/applications/graphics/ksquirrel/debian/control
+++ b/debian/_base/applications/graphics/ksquirrel/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper (>= 10~),
cdbs, quilt,
libksquirrel-trinity-dev,
libkonq4-trinity-dev,
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/docs b/debian/_base/applications/graphics/ksquirrel/debian/docs
index 724e08449..6f12db508 100644
--- a/debian/_base/applications/graphics/ksquirrel/debian/docs
+++ b/debian/_base/applications/graphics/ksquirrel/debian/docs
@@ -1,2 +1,2 @@
+AUTHORS
README
-TODO
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 b/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
deleted file mode 100644
index a6da62b4c..000000000
--- a/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\"
-.TH "KSQUIRREL-LIBS-CONFIGURATOR" "1" "september 13, 2008" "Paul Gevers" "Graphics"
-.SH "NAME"
-ksquirrel\-libs\-configurator \- library configurator for ksquirel
-.SH "SYNOPSIS"
-.B ksquirrel\-libs\-configurator
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B ksquirrel\-libs\-configurator
-and
-.B ksquirrel\-libs\-configurator\-real
-commands.
-\fBksquirrel\-libs\-configurator\fP is a graphical user interface that lets you select which libraries should be enabled/disabled in ksquirrel.
-.SH "OPTIONS"
-These programs does not have any options.
-.SH "SEE ALSO"
-ksquirrel(1)
-.SH "AUTHORS"
-ksquirrel\-libs\-configurator was written by <Baryshev Dmitry>.
-.PP
-This manual page was written by Paul Gevers <paul@climbing.nl>,
-for the Debian project (but may be used by others).
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/rules b/debian/_base/applications/graphics/ksquirrel/debian/rules
index 813fff66f..8f95f25f5 100755
--- a/debian/_base/applications/graphics/ksquirrel/debian/rules
+++ b/debian/_base/applications/graphics/ksquirrel/debian/rules
@@ -108,12 +108,6 @@ binary-arch: build install
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
- dh_installman debian/ksquirrel-libs-configurator.1
- cp -a debian/ksquirrel-trinity/usr/share/man debian/ksquirrel-trinity/opt/trinity/share/
- rm -fr debian/ksquirrel-trinity/usr/share/man
- dh_link \
- opt/trinity/share/man/man1/ksquirrel-libs-configurator.1 \
- opt/trinity/share/man/man1/ksquirrel-libs-configurator-real.1
dh_strip
dh_compress
dh_fixperms
diff --git a/debian/_base/applications/graphics/ksquirrel/debian/watch b/debian/_base/applications/graphics/ksquirrel/debian/watch
deleted file mode 100644
index a276799ff..000000000
--- a/debian/_base/applications/graphics/ksquirrel/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-http://sf.net/ksquirrel/ksquirrel-([\d.]*)\.tar\.bz2
diff --git a/debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/graphics/potracegui/debian/compat b/debian/_base/applications/graphics/potracegui/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/graphics/potracegui/debian/compat
+++ b/debian/_base/applications/graphics/potracegui/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/graphics/potracegui/debian/control b/debian/_base/applications/graphics/potracegui/debian/control
index 691f889d4..e76db0ec0 100644
--- a/debian/_base/applications/graphics/potracegui/debian/control
+++ b/debian/_base/applications/graphics/potracegui/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net>
Uploaders: Bartosz Fenski <fenio@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: potracegui-trinity
diff --git a/debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kasablanca/debian/compat b/debian/_base/applications/internet/kasablanca/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kasablanca/debian/compat
+++ b/debian/_base/applications/internet/kasablanca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kasablanca/debian/control b/debian/_base/applications/internet/kasablanca/debian/control
index 5e701cb6c..75b562ffe 100644
--- a/debian/_base/applications/internet/kasablanca/debian/control
+++ b/debian/_base/applications/internet/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libssl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libssl-dev
Standards-Version: 3.8.3
Package: kasablanca-trinity
diff --git a/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kbiff/debian/compat b/debian/_base/applications/internet/kbiff/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kbiff/debian/compat
+++ b/debian/_base/applications/internet/kbiff/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kbiff/debian/control b/debian/_base/applications/internet/kbiff/debian/control
index 273bec840..6615dd019 100644
--- a/debian/_base/applications/internet/kbiff/debian/control
+++ b/debian/_base/applications/internet/kbiff/debian/control
@@ -2,7 +2,7 @@ Source: kbiff-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
Standards-Version: 3.9.1
Package: kbiff-trinity
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/compat b/debian/_base/applications/internet/kftpgrabber/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/compat
+++ b/debian/_base/applications/internet/kftpgrabber/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/control b/debian/_base/applications/internet/kftpgrabber/debian/control
index 832139e15..fec3c520e 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/control
+++ b/debian/_base/applications/internet/kftpgrabber/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libssl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libssl-dev
Standards-Version: 3.8.3
Homepage: http://www.kftp.org
diff --git a/debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/knmap/debian/compat b/debian/_base/applications/internet/knmap/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/knmap/debian/compat
+++ b/debian/_base/applications/internet/knmap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/knmap/debian/control b/debian/_base/applications/internet/knmap/debian/control
index 7d46e8cd9..92ca50aa0 100644
--- a/debian/_base/applications/internet/knmap/debian/control
+++ b/debian/_base/applications/internet/knmap/debian/control
@@ -2,7 +2,7 @@ Source: knmap-trinity
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.2
Package: knmap-trinity
diff --git a/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/konversation/debian/compat b/debian/_base/applications/internet/konversation/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/konversation/debian/compat
+++ b/debian/_base/applications/internet/konversation/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/konversation/debian/control b/debian/_base/applications/internet/konversation/debian/control
index d7f6289bb..5bd1d397c 100644
--- a/debian/_base/applications/internet/konversation/debian/control
+++ b/debian/_base/applications/internet/konversation/debian/control
@@ -4,17 +4,17 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev, dh-python
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
Package: konversation-trinity
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}
Replaces: konversation-trinity (<< 4:14.0.0~)
Breaks: konversation-trinity (<< 4:14.0.0~)
-Recommends: python-all, ruby
+Recommends: python3-all, ruby
Suggests: libsoap-lite-perl
Description: user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
Konversation is a client for the Internet Relay Chat (IRC) protocol.
diff --git a/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs b/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
index e7f450c0c..0b6e0f321 100644
--- a/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
@@ -1,2 +1,2 @@
-TODO
AUTHORS
+README.md
diff --git a/debian/_base/applications/internet/konversation/debian/konversation-trinity.install b/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
index c62ad7db5..15ccbbe5e 100644
--- a/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
@@ -6,16 +6,10 @@ debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
debian/tmp/opt/trinity/share/apps/konversation/scripts/*
debian/tmp/opt/trinity/share/apps/konversation/themes/*
debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/*
-#debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/ru/konversation/*
-debian/tmp/opt/trinity/share/doc/tde/HTML/sv/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/*
debian/tmp/opt/trinity/share/icons/*
debian/tmp/opt/trinity/share/locale/*
+debian/tmp/opt/trinity/share/man/man1/*
debian/tmp/opt/trinity/share/services/konvirc.protocol
debian/tmp/opt/trinity/share/services/konvirc6.protocol
diff --git a/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages b/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
deleted file mode 100644
index 8b3496a3d..000000000
--- a/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-#debian/man/*.1
diff --git a/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
deleted file mode 100644
index 719d6e158..000000000
--- a/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Nathaniel</firstname>
- <othername role="mi">W</othername>
- <surname>Turner</surname>
- <email>nate@houseofnate.net</email>
- </author>
- <copyright>
- <year>2004</year>
- <holder>Nathaniel W. Turner</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-05-31</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>KONVERSATION</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>konversation</refname>
- <refpurpose>user friendly IRC client for TDE</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>konversation</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- Konversation is client for the Internet Relay Chat (IRC) protocol.
- </para>
- <para>
- IRC is a great way to meet friends on the net, make new acquaintances and
- lose yourself in talk about your favorite subject.
- </para>
- <para>
- Konversation is under active development and is currently in beta.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options.
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- <variablelist>
- <title>Options</title>
- <varlistentry>
- <term><option>--server</option>
- <arg choice="req"><replaceable>server</replaceable></arg></term>
- <listitem><para>Server to connect</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--port</option>
- <arg choice="req"><replaceable>port</replaceable></arg></term>
- <listitem><para>Port to use (default: 6667)</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--channel</option>
- <arg choice="req"><replaceable>channel</replaceable></arg></term>
- <listitem><para>Channel to join after connection</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--nick</option>
- <arg choice="req"><replaceable>nickname</replaceable></arg></term>
- <listitem><para>Nickname to use</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--password</option>
- <arg choice="req"><replaceable>password</replaceable></arg></term>
- <listitem><para>Password for connection</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--ssl</option></term>
- <listitem><para>Use SSL for connection (default:
- false)</para></listitem>
- </varlistentry>
- </variablelist>
- </para>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </refsect1>
- <refsect1>
- <title>SCRIPTING</title>
- <para>Konversation looks for scripts in <filename
- class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
- in <filename
- class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
- To execute a script, use the <command>exec</command> command:</para>
- <cmdsynopsis>
- <command>/exec</command>
- <arg choice="req"><replaceable>scriptname</replaceable></arg>
- <arg choice="opt"><replaceable>arguments</replaceable></arg>
- </cmdsynopsis>
- <para>
- For example:
- </para>
- <para><userinput>/exec gauge 75</userinput></para>
- </refsect1>
- <refsect1>
- <title>FILES</title>
- <para>
- <variablelist>
- <varlistentry>
- <term><filename>~/.trinity/share/config/konversationrc</filename></term>
- <listitem><para>Main configuration</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <filename>~/.trinity/share/config/konversation.eventsrc</filename>
- </term>
- <listitem><para>Notification settings</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <filename
- class="directory">~/.trinity/share/apps/konversation/logs</filename>
- </term>
- <listitem><para>Directory containing channel log
- files</para></listitem>
- </varlistentry>
- </variablelist>
- </para>
- </refsect1>
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- The Konversation Handbook is an excellent resource for further reading.
- It can be found under the <guimenu>Help</guimenu> menu in Konversation.
- </para>
- <para>
- The following manual pages may also be of interest:
- <citerefentry>
- <refentrytitle>konversationircprotocolhandler</refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>dcop</refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Nathaniel W. Turner
- <email>nate@houseofnate.net</email> for the
- <productname>Debian</productname> system (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
deleted file mode 100644
index 3a82060c1..000000000
--- a/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Nathaniel</firstname>
- <othername role="mi">W</othername>
- <surname>Turner</surname>
- <email>nate@houseofnate.net</email>
- </author>
- <copyright>
- <year>2004</year>
- <holder>Nathaniel W. Turner</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2004-07-06</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>KONVERSATIONIRCPROTOCOLHANDLER</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>konversationircprotocolhandler</refname>
- <refpurpose>handler for irc:// URI scheme</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>konversationircprotocolhandler</command>
- <arg choice="req">
- <option>URI</option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- This program takes a URI of the form
- irc://<replaceable>server</replaceable>:<replaceable>port</replaceable>/
- (or simply irc://<replaceable>server</replaceable>/) and opens a
- connection to the specified IRC server in a running Konversation client.
- </para>
- <para>
- This program is registered with TDE as a handler for the irc URI scheme,
- and TDE applications will use this program to handle such URI.
- (For example, it will be called if a user clicks on an irc:// link on a
- web page in Konqueror.)
- </para>
- <para>
- This program can also be used directly, but since it is somewhat internal
- to Konversation, it's interface might change in an incompatible way, and
- relying on it is not advised. It is better to use Konversation's dcop
- interface directly.
- </para>
- </refsect1>
- <refsect1>
- <title>BUGS</title>
- <para>
- This program will only work if there is a currently running konversation
- process.
- </para>
- </refsect1>
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>konversation</refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>dcop</refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Nathaniel W. Turner
- <email>nate@houseofnate.net</email> for the
- <productname>Debian</productname> system (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/debian/_base/applications/internet/konversation/debian/rules b/debian/_base/applications/internet/konversation/debian/rules
index 61fe9b5c9..1fc2edbda 100755
--- a/debian/_base/applications/internet/konversation/debian/rules
+++ b/debian/_base/applications/internet/konversation/debian/rules
@@ -18,22 +18,10 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON"
-### Manpages
-XP = xsltproc --nonet --output debian/man/
-DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
-
-%.1 : %.1.docbook
- $(XP) $(DB2MAN) $<
-
-GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation-trinity:: $(GENERATED_MANPAGES)
-clean::
- -rm -f $(GENERATED_MANPAGES)
- -rm -f po/*/konversation.gmo
+binary-install/konversation-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/konversation/scripts
### Extra file installation
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
- dh_installman debian/man/*.1
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kopete-otr/debian/compat b/debian/_base/applications/internet/kopete-otr/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kopete-otr/debian/compat
+++ b/debian/_base/applications/internet/kopete-otr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kopete-otr/debian/control b/debian/_base/applications/internet/kopete-otr/debian/control
index 1840098de..561510009 100644
--- a/debian/_base/applications/internet/kopete-otr/debian/control
+++ b/debian/_base/applications/internet/kopete-otr/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
Standards-Version: 3.8.4
Package: kopete-otr-trinity
diff --git a/debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kshowmail/debian/compat b/debian/_base/applications/internet/kshowmail/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kshowmail/debian/compat
+++ b/debian/_base/applications/internet/kshowmail/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kshowmail/debian/control b/debian/_base/applications/internet/kshowmail/debian/control
index 16085c4cb..95597c177 100644
--- a/debian/_base/applications/internet/kshowmail/debian/control
+++ b/debian/_base/applications/internet/kshowmail/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Lionel Le Folgoc <mrpouit@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev
Standards-Version: 3.7.2
Package: kshowmail-trinity
diff --git a/debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kstreamripper/debian/compat b/debian/_base/applications/internet/kstreamripper/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kstreamripper/debian/compat
+++ b/debian/_base/applications/internet/kstreamripper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kstreamripper/debian/control b/debian/_base/applications/internet/kstreamripper/debian/control
index f0e4fdf28..6c419ec03 100644
--- a/debian/_base/applications/internet/kstreamripper/debian/control
+++ b/debian/_base/applications/internet/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
Section: sound
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kstreamripper-trinity
diff --git a/debian/_base/applications/internet/kstreamripper/debian/dirs b/debian/_base/applications/internet/kstreamripper/debian/dirs
deleted file mode 100644
index a59ccc8af..000000000
--- a/debian/_base/applications/internet/kstreamripper/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/pixmaps
diff --git a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
deleted file mode 100644
index f5542ab64..000000000
--- a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
- if [ -x /usr/bin/update-desktop-database ] ; then
- /usr/bin/update-desktop-database -q
- fi
-fi
-
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
deleted file mode 100644
index 5209bcb38..000000000
--- a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
- update-desktop-database -q
- fi
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1 b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
deleted file mode 100644
index 3129be689..000000000
--- a/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH "KSTREAMRIPPER" "1" "Apr 26, 2004" "Michael Ablassmeier" "sound"
-.SH "NAME"
-kstreamripper \- TDE frontend for streamripper
-.SH "SYNOPSIS"
-.B kstreamripper [Qt\-options] [TDE\-options]
-.SH "DESCRIPTION"
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-.SH "OPTIONS"
-.IP "\fB\-\-help\fR"
-Show help about options
-.IP "\fB\-\-help\-qt\fR"
-Show Qt specific options
-.IP "\fB\-\-help\-tde\fR"
-Show TDE specific options
-.IP "\fB\-\-help\-all\fR"
-Show all options
-.IP "\fB\-\-author\fR"
-Show author information
-.IP "\fB\-v, \-\-version\fR"
-Show version information
-.IP "\fB\-\-license\fR"
-Show license information
-.IP "\fB\-\-\fR"
-End of options
-.SH "SEE ALSO"
-streamripper(1)
-.SH "AUTHOR"
-2004 \- Created by Michael Ablassmeier (abi@grinser.de) for the Debian Project.
diff --git a/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/ktorrent/debian/compat b/debian/_base/applications/internet/ktorrent/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/ktorrent/debian/compat
+++ b/debian/_base/applications/internet/ktorrent/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control
index d7582a0ec..3b335272c 100644
--- a/debian/_base/applications/internet/ktorrent/debian/control
+++ b/debian/_base/applications/internet/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: ktorrent-trinity
diff --git a/debian/_base/applications/internet/kvirc/debian/compat b/debian/_base/applications/internet/kvirc/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kvirc/debian/compat
+++ b/debian/_base/applications/internet/kvirc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control
index 0d69a5b21..6b9931399 100644
--- a/debian/_base/applications/internet/kvirc/debian/control
+++ b/debian/_base/applications/internet/kvirc/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kvirc.net/
diff --git a/debian/_base/applications/internet/kvirc/debian/rules b/debian/_base/applications/internet/kvirc/debian/rules
index 6fc9dffe2..6ca089653 100755
--- a/debian/_base/applications/internet/kvirc/debian/rules
+++ b/debian/_base/applications/internet/kvirc/debian/rules
@@ -47,7 +47,7 @@ endif
#
# Don't compress these files
#
-DEB_COMPRESS_EXCLUDE := .kvs
+DEB_COMPRESS_EXCLUDE_ALL += .kvs
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
diff --git a/debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/kvpnc/debian/compat b/debian/_base/applications/internet/kvpnc/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/kvpnc/debian/compat
+++ b/debian/_base/applications/internet/kvpnc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/kvpnc/debian/control b/debian/_base/applications/internet/kvpnc/debian/control
index 18ca8c728..d628ae4bb 100644
--- a/debian/_base/applications/internet/kvpnc/debian/control
+++ b/debian/_base/applications/internet/kvpnc/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
Standards-Version: 3.8.4
Package: kvpnc-trinity
diff --git a/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/smb4k/debian/compat b/debian/_base/applications/internet/smb4k/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/smb4k/debian/compat
+++ b/debian/_base/applications/internet/smb4k/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/smb4k/debian/control b/debian/_base/applications/internet/smb4k/debian/control
index 871920dcd..c011ae610 100644
--- a/debian/_base/applications/internet/smb4k/debian/control
+++ b/debian/_base/applications/internet/smb4k/debian/control
@@ -2,7 +2,7 @@ Source: smb4k-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: tdebase-trinity-dev, tdelibs14-trinity-dev, libart-2.0-dev, libpng-dev, zlib1g-dev, debhelper (>= 9~), cdbs, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://smb4k.berlios.de/
diff --git a/debian/_base/applications/misc/fusion-icon/debian/patches/series b/debian/_base/applications/internet/smb4k/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/misc/fusion-icon/debian/patches/series
+++ b/debian/_base/applications/internet/smb4k/debian/patches/series
diff --git a/debian/_base/applications/internet/smb4k/debian/rules b/debian/_base/applications/internet/smb4k/debian/rules
index 95e8cd9f1..a6797f19a 100755
--- a/debian/_base/applications/internet/smb4k/debian/rules
+++ b/debian/_base/applications/internet/smb4k/debian/rules
@@ -1,33 +1,17 @@
#!/usr/bin/make -f
-#
-# Uhm, too much complicated eh?
-#
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/internet/smb4k/debian/watch b/debian/_base/applications/internet/smb4k/debian/watch
deleted file mode 100644
index 70154d877..000000000
--- a/debian/_base/applications/internet/smb4k/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-version=3
-opts=downloadurlmangle=s/prdownload/download/ \
- http://developer.berlios.de/project/showfiles.php?group_id=769 \
- http://prdownload.berlios.de/smb4k/smb4k-([\d\.]+)\.tar\.bz2
-
-
diff --git a/debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/internet/tork/debian/compat b/debian/_base/applications/internet/tork/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/internet/tork/debian/compat
+++ b/debian/_base/applications/internet/tork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/internet/tork/debian/control b/debian/_base/applications/internet/tork/debian/control
index 8acf55f64..a3b2d8a99 100644
--- a/debian/_base/applications/internet/tork/debian/control
+++ b/debian/_base/applications/internet/tork/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Homepage: http://tork.sourceforge.net/
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev
Standards-Version: 3.9.1
Package: tork-trinity
diff --git a/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/bibletime/debian/compat b/debian/_base/applications/misc/bibletime/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/bibletime/debian/compat
+++ b/debian/_base/applications/misc/bibletime/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control
index efb47392c..2f447bb7e 100644
--- a/debian/_base/applications/misc/bibletime/debian/control
+++ b/debian/_base/applications/misc/bibletime/debian/control
@@ -1,6 +1,6 @@
Source: bibletime-trinity
Section: tde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Standards-Version: 3.8.4
diff --git a/debian/_base/applications/misc/bibletime/debian/de/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
deleted file mode 100644
index a7b223af3..000000000
--- a/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Software für das Bibelstudium für TDE
-.SH "ÃœBERSICHT"
-.B bibletime
-[
-\fIQt\-Optionen\fR
-]
-[
-\fITDE\-Optionen\fR
-]
-[
-\fIOptionen\fR
-]
-.SH "BESCHREIBUNG"
-Diese Manpage beschreibt die
-TDE\-Applikation
-.B bibletime
-und wurde für Debian GNU/Linux geschrieben, weil
-das Programm selbst keine Manpage mitbrachte.
-.P
-.B BibleTime
-ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium
-für UNIX\-Systeme.
-Es erfordert eine laufende TDE\-Umgebung und die Bibliothek SWORD.
-BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln,
-Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen
-Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern,
-drucken usw.).
-.SS "Einfache Optionen:"
-.TP
-\fB\-\-help\fR
-Optionen von "Hilfe zu" anzeigen
-.TP
-\fB\-\-help\-qt\fR
-Spezielle Optionen zu Qt anzeigen
-.TP
-\fB\-\-help\-tde\fR
-Spezielle Optionen zu TDE anzeigen
-.TP
-\fB\-\-help\-all\fR
-Alle Optionen anzeigen
-.TP
-\fB\-\-author\fR
-Autoren\-Information anzeigen
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Versionsinformation anzeigen
-.TP
-\fB\-\-license\fR
-Lizenz\-Info anzeigen
-.TP
-\fB\-\-\fR
-Ende der Optionen
-.SH "OPTIONEN"
-.TP
-\fB\-\-debug\fR
-Fehlermeldungen aktivieren
-.TP
-\fB\-\-ignore\-session\fR
-Die Startsitzung ignorieren, die beim letzten Beenden von BibleTime
-gespeichert wurde.
-.TP
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Die Standardbibel an der angegebenen Stelle \fIkey\fR öffnen.
-Verwenden Sie \fIrandom\fR, um eine zufällige Stelle aufzuschlagen.
-.SH "SIEHE AUCH"
-Die vollständige Dokumentation für
-.B bibletime
-und das
-.B Bibelstudium
-werden als DocBook\-Handbuch bereitgestellt. Wenn das Progamm
-.B khelpcenter
-richtig eingerichtet ist, sollte das Kommando
-.IP
-.B khelpcenter help:/bibletime
-.PP
-das komplette Handbuch zugänglich machen.
-.SH "FEHLER"
-Bitte melden Sie Fehler an
-.br
-http://bugs.trinitydesktop.org oder info@bibletime.info ,
-.br
-nicht direkt an die Autoren.
-.br
-.SH "AUTOREN"
-BibleTime wurde geschrieben von:
-.br
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br
-Martin Gruner <mg.pub@gmx.net>
-.br
-Nikolay Igotti <olonho@hotmail.com>
-.br
-Gary Sims <gary@garysims.co.uk>
-.br
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br
-James Ots <me@jamesots.com>
-.br
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P
-Diese Manpage wurde erstellt von
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-für Debian GNU/Linux (kann aber auch von anderen genutzt werden).
diff --git a/debian/_base/applications/misc/bibletime/debian/docs b/debian/_base/applications/misc/bibletime/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/misc/bibletime/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/misc/bibletime/debian/en/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
deleted file mode 100644
index 46332c7d9..000000000
--- a/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Bible study tool for TDE
-.SH "SYNOPSIS"
-.B bibletime
-[
-\fIQt\-options\fR
-]
-[
-\fITDE\-options\fR
-]
-[
-\fIoptions\fR
-]
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B bibletime
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B BibleTime
-is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options.
-.SH "OPTIONS"
-.TP
-\fB\-\-debug\fR
-Enable debug messages.
-.TP
-\fB\-\-ignore\-session\fR
-Ignore the startup session that was saved when BibleTime was closed
-the last time.
-.TP
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Open the default bible with the given \fIkey\fR.
-Use
-.I random
-to open at a random position.
-.SH "SEE ALSO"
-The full documentations for
-.B bibletime
-and
-.B bible study
-are maintained as docbook manuals. If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/bibletime
-.PP
-should give you access to the complete manual.
-.SH "BUGS"
-Please use
-.br
-http://bugs.trinitydesktop.org or info@bibletime.info
-.br
-to report bugs, do not mail the authors directly.
-.br
-.SH "AUTHOR"
-BibleTime was written by
-.br
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br
-Martin Gruner <mg.pub@gmx.net>
-.br
-Nikolay Igotti <olonho@hotmail.com>
-.br
-Gary Sims <gary@garysims.co.uk>
-.br
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br
-James Ots <me@jamesots.com>
-.br
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P
-This manual page was prepared by
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/misc/bibletime/debian/install b/debian/_base/applications/misc/bibletime/debian/install
index dc727ccec..dcf290ae2 100644
--- a/debian/_base/applications/misc/bibletime/debian/install
+++ b/debian/_base/applications/misc/bibletime/debian/install
@@ -1,3 +1 @@
-bibletime.xpm /opt/trinity/share/pixmaps/
-en/bibletime.1 /opt/trinity/share/man/man1
-de/bibletime.1 /opt/trinity/share/man/de/man1
+debian/bibletime.xpm /opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/misc/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules
index 430b47715..a6797f19a 100755
--- a/debian/_base/applications/misc/bibletime/debian/rules
+++ b/debian/_base/applications/misc/bibletime/debian/rules
@@ -1,23 +1,17 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_DH_INSTALL_SOURCEDIR := debian
-
-DEB_BUILDDIR = $(DEB_SRCDIR)
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-binary-install/bibletime-trinity::
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/*
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
index 55670d8c4..35441d9b7 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
Section: libs
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
Standards-Version: 3.8.4
Package: compizconfig-backend-tdeconfig-trinity
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/common/cmake/debian/cdbs/versions.pl b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/debian/_base/common/cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/compat b/debian/_base/applications/misc/desktop-effects-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/compat
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/control b/debian/_base/applications/misc/desktop-effects-tde/debian/control
index 9c981fe54..7bccf8499 100644
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/control
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/control
@@ -2,16 +2,16 @@ Source: desktop-effects-tde-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev
+Build-Depends-Indep: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev,
+ dh-python, python3-all-dev, pytde-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
+X-Python3-Version: all
Package: desktop-effects-tde-trinity
Architecture: all
-Depends: ${python:Depends}, python-tqt, python-trinity-trinity
+Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde
Replaces: desktop-effects-kde-trinity (<< 4:14.0.0~)
Breaks: desktop-effects-kde-trinity (<< 4:14.0.0~)
-XB-Python-Version: ${python:Versions}
Description: compiz setup tool for Trinity
A simple Compiz configuration tool for Trinity. Installs and sets Compiz
as the window manager.
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
deleted file mode 100644
index 2b6b93781..000000000
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
+++ /dev/null
@@ -1,8 +0,0 @@
-desktop-effects-tde /opt/trinity/bin/
-25enable-compiz /etc/X11/Xsession.d/
-DesktopEffects/DesktopEffectsCommon.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsDialog.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsTDE.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/__init__.py /opt/trinity/share/pyshared/DesktopEffects/
-data/* /opt/trinity/share/apps/desktop-effects-tde/
-desktop-effects-tde.desktop /opt/trinity/share/applications/
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/rules b/debian/_base/applications/misc/desktop-effects-tde/debian/rules
index eef8add16..bcea12716 100755
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/rules
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/rules
@@ -1,26 +1,20 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
binary-install/desktop-effects-tde-trinity::
- ${DH_PYTHON2} -pdesktop-effects-tde-trinity
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
diff --git a/debian/_base/applications/misc/fusion-icon/debian/changelog b/debian/_base/applications/misc/fusion-icon/debian/changelog
deleted file mode 100644
index 87f2b117a..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/changelog
+++ /dev/null
@@ -1,76 +0,0 @@
-fusion-icon-trinity (0.0.0+git20071028-0ubuntu1) jaunty; urgency=low
-
- * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 16 Apr 2009 19:57:00 -0600
-
-fusion-icon (0.0.0+git20071028-2ubuntu2) hardy; urgency=low
-
- * Rebuild package so that it uses the python-central's new directories,
- to avoid an installation error (LP: #207831).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 28 Mar 2008 00:22:47 +0100
-
-fusion-icon (0.0.0+git20071028-2ubuntu1) hardy; urgency=low
-
- * Manual sync to workaround .orig.tar.gz mismatch (LP: #204799).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 20:55:03 +0100
-
-fusion-icon (0.0.0+git20071028-2) unstable; urgency=medium
-
- * debian/control:
- - Bump python-central build dependency's minimum version to 0.6.0.
- - Remove "${shlibs:Depends}" from Depends.
- * debian/rules:
- - Do not try to remove usr/lib, as python-central doesn't create it
- anymore now (Closes: #472010).
- - Remove unnecessary explicit dh_pycentral call.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 19:57:39 +0100
-
-fusion-icon (0.0.0+git20071028-1) unstable; urgency=low
-
- * Initial upload to Debian (Closes: #461769).
- * debian/rules:
- - Change priority from "extra" to "optional".
- - Change the Maintainer to myself and add the python-apps team
- as Uploader.
- - Add SVN information.
- * debian/copyright:
- - Some formatting changes.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 20 Jan 2008 21:34:55 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu2) hardy; urgency=low
-
- * patches/remove_shabangs.patch:
- - Remove Python shabangs
- * patches/update-desktop-file.patch:
- - Update .desktop file to match the current FD.o standards
- - Add Catalan and Spanish translations
- - Launch with the "--no-start" option, so that it doesn't reload
- Compiz when it's run from the menu
- * patches/glx_vendor_crash.patch:
- - Always define the self.glx_vendor variable, to avoid and
- AttributeError (LP: #175504)
- * Add a .xpm version of the icon (debian/fusion-icon.xpm) and a
- menu file (debian/menu, debian/install)
- * Symlink the .png icon to /usr/share/pixmaps, so that it's
- displayed in the menu and the tray (debian/links)
- * Add a manpage (debian/fusion-icon.1, debian/manpages)
- * debian/control:
- - Bump standards version to 3.7.3
- - Bump cdbs' and debhelper's minium versions.
- - Move python-central and intltool to Build-Depends-Indep
- - Add python-compizconfig dependency (LP: #174507)
- - Add python-qt4 as alternative dependency to python-gtk2
- - Change short description
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Tue, 11 Dec 2007 20:49:24 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu1) hardy; urgency=low
-
- * Initial upload.
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 28 Oct 2007 11:28:19 -0400
diff --git a/debian/_base/applications/misc/fusion-icon/debian/compat b/debian/_base/applications/misc/fusion-icon/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/applications/misc/fusion-icon/debian/control b/debian/_base/applications/misc/fusion-icon/debian/control
deleted file mode 100644
index 853bb741f..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: fusion-icon-trinity
-Section: x11
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
-XS-Python-Version: all
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 9~), quilt, pkg-config, python-all-dev
-Build-Depends-Indep: python-support (>= 0.6) | dh-python
-Standards-Version: 3.8.4
-
-Package: fusion-icon-trinity
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Replaces: fusion-icon-trinity (<< 4:14.0.0~)
-Breaks: fusion-icon-trinity (<< 4:14.0.0~)
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
-Description: tray icon to launch and manage Compiz Fusion [Trinity]
- The OpenCompositing Project brings 3D desktop visual effects that
- improve the usability and eye candy of the X Window System and provide
- increased productivity.
- .
- This package contains a tray icon that can launch Compiz and its
- decorators.
diff --git a/debian/_base/applications/misc/fusion-icon/debian/copyright b/debian/_base/applications/misc/fusion-icon/debian/copyright
deleted file mode 100644
index ae1ce34fa..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/copyright
+++ /dev/null
@@ -1,31 +0,0 @@
-This package was debianized by Michael Vogt <mvo@ubuntu.com>
-Wed, 28 Oct 2007 15:59:31 +0200.
-
-It was downloaded from git://anongit.compiz-fusion.org/users/crdlb/fusion-icon
-
-Upstream Author:
-
- Christopher Williams
-
-Copyright:
-
- Copyright (C) 2007 Christopher Williams
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 2007 Michael Vogt <mvo@ubuntu.com>,
-(C) 2008 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>, and it
-is licensed under the GPL (see above).
diff --git a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1 b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
deleted file mode 100644
index 1b15860e1..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.TH FUSION\-ICON "1" "11 December 2007"
-.SH NAME
-fusion\-icon \- tray icon to launch and manage Compiz Fusion
-.SH SYNOPSIS
-.B fusion\-icon\fR [\fBOPTIONS\fR]
-.SH DESCRIPTION
-.PP
-This man page documents briefly the \fBfusion\-icon\fR command.
-\fBfusion\-icon\fR is a tray icon for easy window manager and window
-decorator switching, and it is being developed as part of the Open
-Compositing project.
-.SH OPTIONS
-.TP
-.B \-\-version
-Show \fBfusion\-icon\fR's version number and exit.
-.TP
-\fB\-s\fR <seconds>, \fB\-\-sleep\fR=<seconds>
-Sleep for \fIseconds\fR seconds before launching \fBfusion\-icon\fR.
-.TP
-\fB\-i\fR <interface>, \fB\-\-interface\fR=<interface>
-Try a certain interface first.
-.TP
-\fB\-u\fR, \fB\-\-no\-interface\fR
-Do not use any interface.
-.TP
-\fB\-f\fR, \fB\-\-force\-compiz\fR
-Start compiz regardless of environment or configuration.
-.TP
-\fB\-n\fR, \fB\-\-no\-start\fR
-Run, but do not start a window manager.
-
-.SH SEE ALSO
-.BR compiz (1)
-.PP
-
-.SH COPYRIGHT
-This manual page was written by Siegfried\-Angel Gevatter Pujals <rainct@ubuntu.com>.
-It is released under the GNU General Public License, version 2 or later.
diff --git a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
deleted file mode 100644
index fe0843739..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
+++ /dev/null
@@ -1,359 +0,0 @@
-/* XPM */
-static char * fusion_icon_xpm[] = {
-"32 32 324 2",
-" c None",
-". c #C8E3FA",
-"+ c #D4E9FB",
-"@ c #FDFEFF",
-"# c #F0F5FB",
-"$ c #C6E2FA",
-"% c #CDE5FB",
-"& c #CBE6FB",
-"* c #C5E6FC",
-"= c #BEE7FB",
-"- c #B6E6FB",
-"; c #AAE3FB",
-"> c #9DDFFA",
-", c #93DCF9",
-"' c #E3F3FA",
-") c #E0EFF7",
-"! c #90BFE4",
-"~ c #77A8DF",
-"{ c #C3E0FA",
-"] c #C9E4FB",
-"^ c #C5E4FB",
-"/ c #C1E6FC",
-"( c #BAE6FB",
-"_ c #B3E5FB",
-": c #A7E2FB",
-"< c #9ADEFA",
-"[ c #8DDBF9",
-"} c #8CDBFB",
-"| c #A9D4E8",
-"1 c #0681C1",
-"2 c #017FBE",
-"3 c #429ECF",
-"4 c #82B7E0",
-"5 c #6EA3DC",
-"6 c #B9DCF9",
-"7 c #ACE1FA",
-"8 c #A1DEF9",
-"9 c #93DAF7",
-"0 c #87D6F7",
-"a c #87D7F8",
-"b c #9FCEE3",
-"c c #007DBD",
-"d c #007CBC",
-"e c #3C99CC",
-"f c #639FD9",
-"g c #B8DFF9",
-"h c #82D4F6",
-"i c #80D2F3",
-"j c #98CAE1",
-"k c #007CBB",
-"l c #007BBB",
-"m c #007BBA",
-"n c #5B9ED6",
-"o c #B7DDF9",
-"p c #7ECFF3",
-"q c #7EBBD6",
-"r c #89B8CC",
-"s c #7CCCEF",
-"t c #7DCFF3",
-"u c #91C5DE",
-"v c #007BB9",
-"w c #007AB9",
-"x c #5B9ED5",
-"y c #B6DEF7",
-"z c #77CBF0",
-"A c #79B9D4",
-"B c #ECF4FB",
-"C c #AEC6D2",
-"D c #77C1E0",
-"E c #8AC1DB",
-"F c #007AB8",
-"G c #0079B7",
-"H c #5B9DD5",
-"I c #B5DDF7",
-"J c #71C8EE",
-"K c #74B6D3",
-"L c #EEF6FD",
-"M c #EFF7FE",
-"N c #D7E3EB",
-"O c #7CB6D2",
-"P c #71C7ED",
-"Q c #70C7EE",
-"R c #83BDD8",
-"S c #0079B6",
-"T c #0078B6",
-"U c #5B9DD4",
-"V c #B4DCF8",
-"W c #6BC3EC",
-"X c #6FB2D1",
-"Y c #99BDCE",
-"Z c #6DBEE5",
-"` c #6BC2EC",
-" . c #7BB8D6",
-".. c #0078B5",
-"+. c #0077B4",
-"@. c #B4DBF7",
-"#. c #65BFE9",
-"$. c #6CAFD0",
-"%. c #C7D8E2",
-"&. c #6EB3D4",
-"*. c #64BEE9",
-"=. c #75B4D4",
-"-. c #0076B3",
-";. c #0076B2",
-">. c #B3DAF6",
-",. c #5FBAE6",
-"'. c #67ACCE",
-"). c #E7EFF6",
-"!. c #84B1C9",
-"~. c #60B9E4",
-"{. c #5EB9E6",
-"]. c #6EAFD0",
-"^. c #0075B2",
-"/. c #0075B1",
-"(. c #5B9CD3",
-"_. c #B3DAF5",
-":. c #59B6E3",
-"<. c #62A8CB",
-"[. c #B2C8D5",
-"}. c #60AFD5",
-"|. c #58B5E3",
-"1. c #68ABCE",
-"2. c #0074B0",
-"3. c #0074AF",
-"4. c #B1DAF5",
-"5. c #52B1E0",
-"6. c #5CA6C9",
-"7. c #CDE6F5",
-"8. c #8CC5E1",
-"9. c #85C1E1",
-"0. c #81BFDF",
-"a. c #7DBEDE",
-"b. c #71B7D9",
-"c. c #51B1E0",
-"d. c #50B1E0",
-"e. c #4FB0E0",
-"f. c #4DAFDF",
-"g. c #4AAEDF",
-"h. c #5EA5CA",
-"i. c #0073AF",
-"j. c #0073AE",
-"k. c #5B9CD2",
-"l. c #B0D9F4",
-"m. c #4CACDE",
-"n. c #59A2C8",
-"o. c #B5DCF1",
-"p. c #BCD7E6",
-"q. c #EAF4FB",
-"r. c #5CABD5",
-"s. c #45A9DD",
-"t. c #43A8DD",
-"u. c #41A7DC",
-"v. c #3FA6DC",
-"w. c #3DA5DC",
-"x. c #3CA5DB",
-"y. c #3AA4DB",
-"z. c #529EC5",
-"A. c #0072AD",
-"B. c #0072AC",
-"C. c #5B9BD2",
-"D. c #B0D7F4",
-"E. c #3DA4DA",
-"F. c #4D99C3",
-"G. c #DEF0FB",
-"H. c #43A3D7",
-"I. c #67A6C7",
-"J. c #BAD7E7",
-"K. c #35A0D7",
-"L. c #34A0D8",
-"M. c #4C99C2",
-"N. c #0071AC",
-"O. c #0071AB",
-"P. c #589AD1",
-"Q. c #AFD6F4",
-"R. c #2F9CD5",
-"S. c #4595C0",
-"T. c #ECF4FC",
-"U. c #64B0D9",
-"V. c #3A9ED4",
-"W. c #CFDEE7",
-"X. c #EBF4FC",
-"Y. c #68AACE",
-"Z. c #4495BF",
-"`. c #0071AA",
-" + c #0070AA",
-".+ c #0070A9",
-"++ c #5497CF",
-"@+ c #ACD6F3",
-"#+ c #2997D2",
-"$+ c #4091BE",
-"%+ c #9BC9E7",
-"&+ c #73A5C3",
-"*+ c #E1EFFC",
-"=+ c #D6E9F8",
-"-+ c #3497CD",
-";+ c #3E8FBB",
-">+ c #006FA9",
-",+ c #006FA8",
-"'+ c #4F95CE",
-")+ c #A6D2F2",
-"!+ c #2393CF",
-"~+ c #318FC2",
-"{+ c #2994CE",
-"]+ c #3491C4",
-"^+ c #CFE1F2",
-"/+ c #D6EAFC",
-"(+ c #92C3E1",
-"_+ c #378BB8",
-":+ c #006EA7",
-"<+ c #006EA6",
-"[+ c #4B91CD",
-"}+ c #A2CFF1",
-"|+ c #1F8ECD",
-"1+ c #1E8ECD",
-"2+ c #7DA8C4",
-"3+ c #CBE4FB",
-"4+ c #4699C9",
-"5+ c #3087B5",
-"6+ c #006DA6",
-"7+ c #006DA5",
-"8+ c #468ECB",
-"9+ c #9ECDF1",
-"0+ c #2691CD",
-"a+ c #2590CD",
-"b+ c #2490CD",
-"c+ c #2390CC",
-"d+ c #218FCC",
-"e+ c #1F8ECC",
-"f+ c #3A88B6",
-"g+ c #BEDCF7",
-"h+ c #C0DEFA",
-"i+ c #ACD3F3",
-"j+ c #1D8AC8",
-"k+ c #198ACA",
-"l+ c #188ACA",
-"m+ c #2A82B3",
-"n+ c #016EA5",
-"o+ c #0570A7",
-"p+ c #0972A8",
-"q+ c #4990CC",
-"r+ c #99C8EF",
-"s+ c #3798CF",
-"t+ c #3598CF",
-"u+ c #3497CF",
-"v+ c #3397CF",
-"w+ c #3296CE",
-"x+ c #3093CC",
-"y+ c #8DB1CF",
-"z+ c #B5D9F9",
-"A+ c #B4D8F9",
-"B+ c #6BAFDA",
-"C+ c #2891CC",
-"D+ c #2690CC",
-"E+ c #248FCB",
-"F+ c #218DCA",
-"G+ c #1E8CCA",
-"H+ c #1B8AC9",
-"I+ c #2880B2",
-"J+ c #0C74A9",
-"K+ c #1076AB",
-"L+ c #1378AC",
-"M+ c #177AAD",
-"N+ c #4E92CE",
-"O+ c #8DB5D9",
-"P+ c #9ECBF3",
-"Q+ c #94C7F1",
-"R+ c #85C0EA",
-"S+ c #72B3DF",
-"T+ c #61A7D4",
-"U+ c #539FCD",
-"V+ c #479BCD",
-"W+ c #3F9ACF",
-"X+ c #5394BD",
-"Y+ c #AAD3F8",
-"Z+ c #A9D3F8",
-"`+ c #A8D1F8",
-" @ c #4197CB",
-".@ c #3B99CF",
-"+@ c #3A98CF",
-"@@ c #3897CE",
-"#@ c #3696CE",
-"$@ c #398AB9",
-"%@ c #187BAD",
-"&@ c #1B7CAF",
-"*@ c #1E7EB0",
-"=@ c #2C85B7",
-"-@ c #4E93CB",
-";@ c #6096D1",
-">@ c #45596A",
-",@ c #5A7389",
-"'@ c #6D8CA6",
-")@ c #7EA0C0",
-"!@ c #8FB7DB",
-"~@ c #9ECAF2",
-"{@ c #97C9F3",
-"]@ c #A0CEF7",
-"^@ c #87C1EC",
-"/@ c #469DCF",
-"(@ c #49A0D2",
-"_@ c #489FD1",
-":@ c #469ED1",
-"<@ c #4590BC",
-"[@ c #2884B3",
-"}@ c #378ABD",
-"|@ c #5999CF",
-"1@ c #689AD1",
-"2@ c #486B90",
-"3@ c #45596B",
-"4@ c #59738B",
-"5@ c #6C8AA5",
-"6@ c #7DA1C1",
-"7@ c #8FB9DC",
-"8@ c #98C9F2",
-"9@ c #8CC3EE",
-"0@ c #7DB9E6",
-"a@ c #6DAFDA",
-"b@ c #65A6CE",
-"c@ c #639FD4",
-"d@ c #6B9CD0",
-"e@ c #47688C",
-"f@ c #475C6E",
-"g@ c #5B758C",
-"h@ c #7391AC",
-"i@ c #446385",
-" ",
-" ",
-" ",
-" ",
-" . + @ # ",
-" $ % & * = - ; > , ' ) ! ~ ",
-" { ] ^ / ( _ : < [ } } } } } } } | 1 2 3 4 5 ",
-" 6 7 8 9 0 a a a a a a a a a a a a a a b c c c d e f ",
-" g h i h h h h h h h h h h h h h h h h j d k k l m n ",
-" o p q r s p p p p p p t t t t t t t t u m m v w w x ",
-" y z A B C D z z z z z z z z z z z z z E w F F G G H ",
-" I J K L M N O P J J J J J J Q Q Q Q Q R G G S T T U ",
-" V W X L M M B Y Z W W W W W W ` ` ` ` .T ....+.+.U ",
-" @.#.$.L M M M M %.&.#.#.#.#.#.#.#.#.*.=.+.+.-.-.;.U ",
-" >.,.'.L M M M M M ).!.~.,.,.,.,.,.,.{.].-.;.^././.(. ",
-" _.:.<.L M M M M M M L [.}.|.|.|.|.|.|.1././.2.2.3.(. ",
-" 4.5.6.L M M M 7.8.9.0.a.b.c.c.d.e.f.g.h.3.3.i.j.j.k. ",
-" l.m.n.L M o.p.q.r.s.t.u.v.w.x.y.y.y.y.z.j.j.A.A.B.C. ",
-" D.E.F.L G.H.I.L J.K.L.L.L.L.L.L.L.L.L.M.B.B.N.O.O.P. ",
-" Q.R.S.T.U.R.V.W.X.Y.R.R.R.R.R.R.R.R.R.Z.O.`. + +.+++ ",
-" @+#+$+%+#+#+#+&+*+=+-+#+#+#+#+#+#+#+#+;+.+>+,+,+,+'+ ",
-" )+!+~+{+!+!+!+]+^+/+(+!+!+!+!+!+!+!+!+_+,+:+:+:+<+[+ ",
-" }+|+|+|+1+1+1+|+2+3+3+4+1+1+1+1+1+1+1+5+<+6+7+7+7+8+ ",
-" 9+0+0+a+b+c+d+e+f+g+h+i+j+k+k+k+k+l+l+m+7+7+n+o+p+q+ ",
-" r+s+t+u+v+v+w+w+x+y+z+A+B+C+D+E+F+G+H+I+p+J+K+L+M+N+ ",
-" O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@.@+@@@#@$@%@&@*@=@-@;@ ",
-" >@,@'@)@!@~@{@]@]@]@^@/@(@_@_@:@<@[@}@|@1@2@ ",
-" 3@4@5@6@7@8@9@0@a@b@c@d@e@ ",
-" f@g@h@i@ ",
-" ",
-" ",
-" "};
diff --git a/debian/_base/applications/misc/fusion-icon/debian/install b/debian/_base/applications/misc/fusion-icon/debian/install
deleted file mode 100644
index 7d4e26567..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.xpm usr/share/pixmaps
diff --git a/debian/_base/applications/misc/fusion-icon/debian/links b/debian/_base/applications/misc/fusion-icon/debian/links
deleted file mode 100644
index 51627e83a..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-opt/trinity/share/icons/hicolor/48x48/apps/fusion-icon.png opt/trinity/share/pixmaps/fusion-icon.png
diff --git a/debian/_base/applications/misc/fusion-icon/debian/manpages b/debian/_base/applications/misc/fusion-icon/debian/manpages
deleted file mode 100644
index 3ba122a39..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.1
diff --git a/debian/_base/applications/misc/fusion-icon/debian/menu b/debian/_base/applications/misc/fusion-icon/debian/menu
deleted file mode 100644
index e85a21dbf..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(fusion-icon-trinity): needs="X11" section="Applications/System/Administration" title="Compiz Fusion Icon [Trinity]" \
- command="/opt/trinity/bin/fusion-icon" icon="/opt/trinity/share/pixmaps/fusion-icon.xpm"
diff --git a/debian/_base/applications/misc/fusion-icon/debian/pycompat b/debian/_base/applications/misc/fusion-icon/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk b/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
deleted file mode 100644
index fbc70a624..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
+++ /dev/null
@@ -1,260 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-# This class is designed to work with Python packages using the
-# 'distutils' build system and comply to the new policy established
-# during summer 2006. Use of the debhelper class to make use of the
-# new dh_python is strongly advised. (This is still left as optional
-# in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy. Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and
-# pycentral methods are available to comply with new policy. Don't forget
-# to update your 'debian/control'. (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- # warning pysupport compatibility mode
- ifneq (, $(cdbs_use_xs_field))
- $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
- endif # use XS field (compat)
-else
- ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- else
- ifneq (, $(DEB_PYTHON_SYSTEM))
- $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
- else
- ifneq (, $(cdbs_use_xs_field))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- ifneq (, $(cdbs_selected_pycompat))
- ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- endif # use pycompat
- endif # unknown method
- endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating. Here is some documentation:)
-$(warning http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'. Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule. In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% :
- -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
- # check if current is in build versions
- ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
- cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
- cdbs_python_build_versions := $(cdbs_python_compile_version)
- else
- cdbs_python_build_versions := $(cdbs_python_current_version)
- endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
- ifneq (, $(cdbs_python_compile_version))
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
- else
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
- endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
- touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
- echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
- rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
- find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/debian/_base/applications/misc/fusion-icon/debian/rules b/debian/_base/applications/misc/fusion-icon/debian/rules
deleted file mode 100755
index a0c6906dd..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/rules
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- include debian/python-distutils-custom.mk
-else
- include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-post-patches::
- # make sure that python binary exists
- # since the existing code is still dependent on python2
- # and cdbs uses python as the default binary name
- test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-binary-install/fusion-icon-trinity::
- mkdir -p debian/fusion-icon-trinity/usr/local/lib
- cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
- rm -rf debian/fusion-icon-trinity/usr/local
- mkdir -p debian/fusion-icon-trinity/temp
- mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
- mkdir -p debian/fusion-icon-trinity/opt/trinity
- cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
- rm -rf debian/fusion-icon-trinity/usr
- ${DH_PYTHON2} -pfusion-icon-trinity
- ###
- # Must be done after invoking dh_pysupport, otherwise python scripts will
- # end up in /usr/share/pyshare instead of dist-packages
- mkdir -p debian/fusion-icon-trinity/usr
- mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
- rm -rf debian/fusion-icon-trinity/temp
- ###
- mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity
- mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/
- rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity
- dh_icons
diff --git a/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldap/debian/compat b/debian/_base/applications/misc/kcmldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldap/debian/compat
+++ b/debian/_base/applications/misc/kcmldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldap/debian/control b/debian/_base/applications/misc/kcmldap/debian/control
index f67cb5723..b8a62a2d1 100644
--- a/debian/_base/applications/misc/kcmldap/debian/control
+++ b/debian/_base/applications/misc/kcmldap/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/compat b/debian/_base/applications/misc/kcmldapcontroller/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/compat
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/control b/debian/_base/applications/misc/kcmldapcontroller/debian/control
index 9b6de5bbe..ff1388334 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/control
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/compat b/debian/_base/applications/misc/kcmldapmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/compat
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/control b/debian/_base/applications/misc/kcmldapmanager/debian/control
index 072371003..189fbb3ce 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/control
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-manager-trinity
diff --git a/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kerberostray/debian/compat b/debian/_base/applications/misc/kerberostray/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kerberostray/debian/compat
+++ b/debian/_base/applications/misc/kerberostray/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kerberostray/debian/control b/debian/_base/applications/misc/kerberostray/debian/control
index 0af0907f4..b4b65fb21 100644
--- a/debian/_base/applications/misc/kerberostray/debian/control
+++ b/debian/_base/applications/misc/kerberostray/debian/control
@@ -2,7 +2,7 @@ Source: kerberostray-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kerberostray-trinity
diff --git a/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/krecipes/debian/compat b/debian/_base/applications/misc/krecipes/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/krecipes/debian/compat
+++ b/debian/_base/applications/misc/krecipes/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/krecipes/debian/control b/debian/_base/applications/misc/krecipes/debian/control
index 4c32c8ee2..cafce1080 100644
--- a/debian/_base/applications/misc/krecipes/debian/control
+++ b/debian/_base/applications/misc/krecipes/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Matthias Julius <mdeb@julius-net.net>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
+Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
Standards-Version: 3.8.1
Homepage: http://krecipes.sourceforge.net/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/
diff --git a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/amarok/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/amarok/debian/compat
+++ b/debian/_base/applications/multimedia/amarok/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index e0593e503..a71ba59fc 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -4,14 +4,14 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2,
tdelibs14-trinity-dev, tdebase-trinity-dev,
libakode-dev, libxine2-dev | libxine-dev,
libtag1-dev, libsqlite3-dev,
default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
libvisual-0.4-dev, libsdl1.2-dev,
libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev,
- ruby, ruby-dev
+ ruby, ruby-dev, dh-python
Standards-Version: 3.8.4
Homepage: http://amarok.kde.org
@@ -21,7 +21,7 @@ Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${so
Replaces: amarok-trinity (<< 4:14.0.0~)
Breaks: amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
- python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
+ python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins
Description: versatile and easy to use audio player for Trinity
Amarok tries to be a little different, providing a simple drag and drop
interface that really makes playlist handling easy.
@@ -57,18 +57,18 @@ Description: base library for Amarok [Trinity]
Package: amarok-common-trinity
Architecture: all
-Depends: ruby
+Depends: ruby, ${python3:Depends}
Replaces: amarok-common-trinity (<< 4:14.0.0~)
Breaks: amarok-common-trinity (<< 4:14.0.0~)
Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby-trinity, python-all, python-tqt
+Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt
Description: architecture independent files for Amarok [Trinity]
This package contains architecture independent files needed for Amarok to run
properly. It also provides Amarok documentation. Therefore, unless you have
'amarok' package installed, you will hardly find this package useful.
.
You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
+ and/or playlist2html scripts. You will also need python3-pytqt for the
WebControl script.
Package: amarok-konqsidebar-trinity
diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index 55c147b76..09544563a 100755
--- a/debian/_base/applications/multimedia/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
@@ -17,3 +17,9 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_ALL_OPTIONS="ON" \
-DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
+
+binary-install/amarok-common-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+ /opt/trinity/share/apps/amarok/scripts/playlist2html
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \
+ /opt/trinity/share/apps/amarok/scripts/webcontrol
diff --git a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/codeine/debian/compat b/debian/_base/applications/multimedia/codeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/codeine/debian/compat
+++ b/debian/_base/applications/multimedia/codeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/codeine/debian/control b/debian/_base/applications/multimedia/codeine/debian/control
index 03cba509a..e1ca4d568 100644
--- a/debian/_base/applications/multimedia/codeine/debian/control
+++ b/debian/_base/applications/multimedia/codeine/debian/control
@@ -2,7 +2,7 @@ Source: codeine-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev
Standards-Version: 3.7.3
Homepage: http://codeine.sourceforge.net/
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/compat b/debian/_base/applications/multimedia/k3b-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/k3b-i18n/debian/compat
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/control b/debian/_base/applications/multimedia/k3b-i18n/debian/control
index a33db1b1e..426d3811a 100644
--- a/debian/_base/applications/multimedia/k3b-i18n/debian/control
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
Build-Depends-Indep: tdelibs14-trinity-dev
Standards-Version: 3.8.3
diff --git a/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/k3b/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/k3b/debian/compat
+++ b/debian/_base/applications/multimedia/k3b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
index 8cc2b03b8..d036d1d22 100644
--- a/debian/_base/applications/multimedia/k3b/debian/control
+++ b/debian/_base/applications/multimedia/k3b/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends:
- cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+ cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
libdvdread-dev, libasound2-dev, lame, libmp3lame-dev,
libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev,
libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev
diff --git a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/k9copy/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/debian/_base/applications/multimedia/k9copy/debian/compat
+++ b/debian/_base/applications/multimedia/k9copy/debian/compat
@@ -1,2 +1,2 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control
index 9899669c7..e94e97d8c 100644
--- a/debian/_base/applications/multimedia/k9copy/debian/control
+++ b/debian/_base/applications/multimedia/k9copy/debian/control
@@ -3,7 +3,8 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, cdbs, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ libdvdread-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/debian/_base/applications/multimedia/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules
index 6219a645e..a6797f19a 100755
--- a/debian/_base/applications/multimedia/k9copy/debian/rules
+++ b/debian/_base/applications/multimedia/k9copy/debian/rules
@@ -1,30 +1,17 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
index fc66a5b21..f5edfda31 100644
--- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev
Standards-Version: 3.8.4
Package: kaffeine-mozilla-trinity
diff --git a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/kaffeine/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/kaffeine/debian/compat
+++ b/debian/_base/applications/multimedia/kaffeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control
index e78bee9c1..e0a2aa138 100644
--- a/debian/_base/applications/multimedia/kaffeine/debian/control
+++ b/debian/_base/applications/multimedia/kaffeine/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev,
libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev,
libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
diff --git a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/kmplayer/debian/compat b/debian/_base/applications/multimedia/kmplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/kmplayer/debian/compat
+++ b/debian/_base/applications/multimedia/kmplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control
index 7aaebc969..72e4988de 100644
--- a/debian/_base/applications/multimedia/kmplayer/debian/control
+++ b/debian/_base/applications/multimedia/kmplayer/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev,
diff --git a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/kplayer/debian/compat b/debian/_base/applications/multimedia/kplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/kplayer/debian/compat
+++ b/debian/_base/applications/multimedia/kplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/kplayer/debian/control b/debian/_base/applications/multimedia/kplayer/debian/control
index b964e58cb..20fdf0f39 100644
--- a/debian/_base/applications/multimedia/kplayer/debian/control
+++ b/debian/_base/applications/multimedia/kplayer/debian/control
@@ -2,7 +2,7 @@ Source: kplayer-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kplayer.sourceforge.net/
#Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git
diff --git a/debian/_base/applications/multimedia/kplayer/debian/docs b/debian/_base/applications/multimedia/kplayer/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/multimedia/kplayer/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/compat b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/mplayerthumbs/debian/compat
+++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/control b/debian/_base/applications/multimedia/mplayerthumbs/debian/control
index aed8fbc85..675c8fd5f 100644
--- a/debian/_base/applications/multimedia/mplayerthumbs/debian/control
+++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/control
@@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.2
Package: mplayerthumbs-trinity
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/compat b/debian/_base/applications/multimedia/rosegarden/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/rosegarden/debian/compat
+++ b/debian/_base/applications/multimedia/rosegarden/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control
index b3a1a57d7..d2fdae5f5 100644
--- a/debian/_base/applications/multimedia/rosegarden/debian/control
+++ b/debian/_base/applications/multimedia/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblirc-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
Standards-Version: 3.8.4
Homepage: http://www.rosegardenmusic.com/
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules
index 1372a08f8..5839a4d6d 100755
--- a/debian/_base/applications/multimedia/rosegarden/debian/rules
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rules
@@ -21,7 +21,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DEB_COMPRESS_EXCLUDE += .rg .wav .docbook
+DEB_COMPRESS_EXCLUDE_ALL += .rg .wav .docbook
binary-install/rosegarden-trinity::
dh_testdir
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/compat b/debian/_base/applications/multimedia/soundkonverter/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/soundkonverter/debian/compat
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control
index 730a04490..d5d1bbcd5 100644
--- a/debian/_base/applications/multimedia/soundkonverter/debian/control
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev
Standards-Version: 3.8.4
Homepage: http://www.kde-apps.org/content/show.php?content=29024
diff --git a/debian/_base/common/cmake/debian/patches/series b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/common/cmake/debian/patches/series
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules
index fa0a1f580..a6797f19a 100755
--- a/debian/_base/applications/multimedia/soundkonverter/debian/rules
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/rules
@@ -1,38 +1,17 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib
-
-install/soundkonverter-trinity::
- install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \
- debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity
-
-install/soundkonverter-amarok-trinity::
- chmod 0755 debian/tmp/opt/trinity/share/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
index fcfaef212..485f58a96 100644
--- a/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
@@ -2,10 +2,10 @@ opt/trinity/bin/soundkonverter
opt/trinity/share/applications/tde/soundkonverter.desktop
opt/trinity/share/apps/soundkonverter/soundkonverterui.rc
opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-opt/trinity/share/apps/soundkonverter/format_infos/
-opt/trinity/share/apps/soundkonverter/pics/
-opt/trinity/share/apps/soundkonverter/plugins/
-opt/trinity/share/doc/
-opt/trinity/share/icons/
-opt/trinity/share/locale/
-opt/trinity/share/mimelnk/
+opt/trinity/share/apps/soundkonverter/format_infos
+opt/trinity/share/apps/soundkonverter/pics
+opt/trinity/share/apps/soundkonverter/plugins
+opt/trinity/share/doc
+opt/trinity/share/icons
+opt/trinity/share/locale
+opt/trinity/share/mimelnk
diff --git a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/multimedia/tderadio/debian/compat b/debian/_base/applications/multimedia/tderadio/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/multimedia/tderadio/debian/compat
+++ b/debian/_base/applications/multimedia/tderadio/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/multimedia/tderadio/debian/control b/debian/_base/applications/multimedia/tderadio/debian/control
index 2c44da7f2..655104221 100644
--- a/debian/_base/applications/multimedia/tderadio/debian/control
+++ b/debian/_base/applications/multimedia/tderadio/debian/control
@@ -2,8 +2,8 @@ Source: tderadio-trinity
Section: sound
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
- liblircclient-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ liblirc-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev
Standards-Version: 3.8.4
Package: tderadio-trinity
diff --git a/debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/basket/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/basket/debian/compat b/debian/_base/applications/office/basket/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/basket/debian/compat
+++ b/debian/_base/applications/office/basket/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/basket/debian/control b/debian/_base/applications/office/basket/debian/control
index ffb9c506c..38ad26000 100644
--- a/debian/_base/applications/office/basket/debian/control
+++ b/debian/_base/applications/office/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~)
Standards-Version: 3.8.4
Package: basket-trinity
diff --git a/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/kbibtex/debian/compat b/debian/_base/applications/office/kbibtex/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/kbibtex/debian/compat
+++ b/debian/_base/applications/office/kbibtex/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/kbibtex/debian/control b/debian/_base/applications/office/kbibtex/debian/control
index b061836c4..84e2ce4f8 100644
--- a/debian/_base/applications/office/kbibtex/debian/control
+++ b/debian/_base/applications/office/kbibtex/debian/control
@@ -2,7 +2,7 @@ Source: kbibtex-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
Standards-Version: 3.9.0
Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex
Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git
diff --git a/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/kbookreader/debian/compat b/debian/_base/applications/office/kbookreader/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/debian/_base/applications/office/kbookreader/debian/compat
+++ b/debian/_base/applications/office/kbookreader/debian/compat
@@ -1,2 +1,2 @@
-9
+10
diff --git a/debian/_base/applications/office/kbookreader/debian/control b/debian/_base/applications/office/kbookreader/debian/control
index e518b3b42..c3634fb63 100644
--- a/debian/_base/applications/office/kbookreader/debian/control
+++ b/debian/_base/applications/office/kbookreader/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://k9copy.sourceforge.net/
diff --git a/debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/keximdb/debian/compat b/debian/_base/applications/office/keximdb/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/keximdb/debian/compat
+++ b/debian/_base/applications/office/keximdb/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/keximdb/debian/control b/debian/_base/applications/office/keximdb/debian/control
index f55077a26..e3117201b 100644
--- a/debian/_base/applications/office/keximdb/debian/control
+++ b/debian/_base/applications/office/keximdb/debian/control
@@ -2,7 +2,7 @@ Source: keximdb-trinity
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Martin Ellis <martin.ellis@kdemail.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, koffice-trinity-dev, libglib2.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, koffice-trinity-dev, libglib2.0-dev
Standards-Version: 3.7.2
Section: tde
diff --git a/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/kile/debian/compat b/debian/_base/applications/office/kile/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/kile/debian/compat
+++ b/debian/_base/applications/office/kile/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/kile/debian/control b/debian/_base/applications/office/kile/debian/control
index e6c22beb3..c8ad1701c 100644
--- a/debian/_base/applications/office/kile/debian/control
+++ b/debian/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
diff --git a/debian/_base/applications/office/kmymoney/debian/README.source b/debian/_base/applications/office/kmymoney/debian/README.source
deleted file mode 100644
index 2a0f24655..000000000
--- a/debian/_base/applications/office/kmymoney/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
-
-Please note that /usr/share/doc/quilt/README.source is only available in quilt
-version 0.46-4.1 or later.
diff --git a/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/kmymoney/debian/compat b/debian/_base/applications/office/kmymoney/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/kmymoney/debian/compat
+++ b/debian/_base/applications/office/kmymoney/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
index 96d794392..4d6a012f9 100644
--- a/debian/_base/applications/office/kmymoney/debian/control
+++ b/debian/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
Standards-Version: 3.8.4
Package: kmymoney2-trinity
diff --git a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..85b95d21e 100644
--- a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
@@ -1 +1,3 @@
+AUTHORS
+README.md
README.Fileformats
diff --git a/debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/knowit/debian/compat b/debian/_base/applications/office/knowit/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/knowit/debian/compat
+++ b/debian/_base/applications/office/knowit/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/knowit/debian/control b/debian/_base/applications/office/knowit/debian/control
index 0e67c0a5e..4c70374cf 100644
--- a/debian/_base/applications/office/knowit/debian/control
+++ b/debian/_base/applications/office/knowit/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://knowit.sourceforge.net/
diff --git a/debian/_base/applications/office/koffice-i18n/debian/compat b/debian/_base/applications/office/koffice-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/koffice-i18n/debian/compat
+++ b/debian/_base/applications/office/koffice-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control b/debian/_base/applications/office/koffice-i18n/debian/control
index 8f7bb1a23..d4a192d8d 100644
--- a/debian/_base/applications/office/koffice-i18n/debian/control
+++ b/debian/_base/applications/office/koffice-i18n/debian/control
@@ -2,397 +2,15 @@ Source: koffice-i18n-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
-Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 9~), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
-Package: koffice-i18n-bg-trinity
+Package: koffice-i18n-trinity
Architecture: all
Section: tde
-Recommends: tde-i18n-bg-trinity
+Recommends: tde-i18n-trinity
Suggests: koffice-trinity
Provides: koffice-i18n-trinity
-Description: Bulgarian (bg) translations for KOffice
- This package contains the Bulgarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ca-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ca-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Catalan (ca) translations for KOffice
- This package contains the Catalan translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cs-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cs-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Czech (cs) translations for KOffice
- This package contains the Czech translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cy-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cy-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Welsh (cy) translations for KOffice
- This package contains the Welsh translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-da-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-da-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Danish (da) translations for KOffice
- This package contains the Danish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-de-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-de-trinity
-Suggests: koffice-trinity, openthesaurus-de-kword
-Provides: koffice-i18n-trinity
-Description: German (de) translations for KOffice
- This package contains the German translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-el-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-el-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Greek (el) translations for KOffice
- This package contains the greek translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-engb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-engb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: British English (en_GB) translations for KOffice
- This package contains the British English (en_GB) translations
- for all applications in the Trinity Office Suite.
-
-Package: koffice-i18n-es-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-es-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Spanish (es) translations for KOffice
- This package contains the Spanish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-et-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-et-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Estonian (et) translations for KOffice
- This package contains the Estonian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-eu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-eu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Basque (eu) translations for KOffice
- This package contains the Basque translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fa-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fa-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Farsi (fa) translations for KOffice
- This package contains the Farsi translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fi-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fi-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Finnish (fi) translations for KOffice
- This package contains the Finnish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: French (fr) translations for KOffice
- This package contains the French translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ga-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ga-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Irish Gaelic (ga) translations for KOffice
- This package contains the Irish Gaelic translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-gl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-gl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Galician (gl) translations for KOffice
- This package contains the Galician translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-hu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-hu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Hungarian (hu) translations for KOffice
- This package contains the Hungarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-it-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-it-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Italian (it) translations for KOffice
- This package contains the Italian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ja-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ja-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Japanese (ja) translations for KOffice
- This package contains the Japanese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-km-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-km-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Khmer (km) translations for KOffice
- This package contains the Khmer translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-lv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-lv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latvian (lv) translations for KOffice
- This package contains the Latvian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ms-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ms-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Malay (ms) translations for KOffice
- This package contains the Malay translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Norwegian Bookmal (nb) translations for KOffice
- This package contains the Norwegian Bookmal translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nds-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nds-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Low Saxon (nds) translations for KOffice
- This package contains the Low Saxon translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ne-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ne-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Nepali (ne) translations for KOffice
- This package contains the Nepali translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Dutch (nl) translations for KOffice
- This package contains the Dutch translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Polish (pl) translations for KOffice
- This package contains the Polish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pt-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pt-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Portuguese (pt) translations for KOffice
- This package contains the Portuguese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ptbr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ptbr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Brazilian Portuguese (pt_BR) translations for KOffice
- This package contains the Brazilian Portuguese translations for all
- applications in the Trinity Office Suite.
-
-Package: koffice-i18n-ru-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ru-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Russian (ru) translations for KOffice
- This package contains the Russian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovak (sk) translations for KOffice
- This package contains the Slovak translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovenian (sl) translations for KOffice
- This package contains the Slovenian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Serbian (sr) translations for KOffice
- This package contains the Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-srlatin-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-srlatin-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latin Serbian (sr@Latn) translations for KOffice
- This package contains the Latin Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Swedish (sv) translations for KOffice
- This package contains the Swedish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-tr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-tr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Turkish (tr) translations for KOffice
- This package contains the Turkish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-uk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-uk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Ukrainian (uk) translations for KOffice
- This package contains the Ukrainian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-zhcn-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhcn-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Simplified (zh_CN) translations for KOffice
- This package contains the Chinese Simplified translations for all
- applications in the Trinity Office Suite.
-
-Package: koffice-i18n-zhtw-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhtw-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Traditional (zh_TW) translations for KOffice
- This package contains the Chinese Traditional translations for all
- applications in the Trinity Office Suite.
+Description: All languages (all) internationalized (i18n) files for KOffice
+ This package contains the All languages (all) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control-lang b/debian/_base/applications/office/koffice-i18n/debian/control-lang
new file mode 100644
index 000000000..f75b7d747
--- /dev/null
+++ b/debian/_base/applications/office/koffice-i18n/debian/control-lang
@@ -0,0 +1,10 @@
+
+Package: koffice-i18n-@pkg_lang@-trinity
+Architecture: all
+Section: tde
+Recommends: tde-i18n-@pkg_lang@-trinity
+Suggests: koffice-trinity
+Provides: koffice-i18n-trinity
+Description: @lang_desc@ (@lang@) internationalized (i18n) files for KOffice
+ This package contains the @lang_desc@ (@lang@) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control-source b/debian/_base/applications/office/koffice-i18n/debian/control-source
new file mode 100644
index 000000000..c1a3a089b
--- /dev/null
+++ b/debian/_base/applications/office/koffice-i18n/debian/control-source
@@ -0,0 +1,6 @@
+Source: koffice-i18n-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
diff --git a/debian/_base/applications/office/koffice-i18n/debian/debiandirs b/debian/_base/applications/office/koffice-i18n/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/debian/_base/applications/office/koffice-i18n/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/debian/_base/applications/office/koffice-i18n/debian/rules b/debian/_base/applications/office/koffice-i18n/debian/rules
index 8fb58ece9..2a292557e 100755
--- a/debian/_base/applications/office/koffice-i18n/debian/rules
+++ b/debian/_base/applications/office/koffice-i18n/debian/rules
@@ -3,11 +3,36 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+I18N_DIR_PREFIX := koffice-i18n
+I18N_DEST_PREFIX := $(I18N_DIR_PREFIX)
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
+
+# Stamps and support variables
+cur_lang = $(word 2,$(subst __, ,$@))
+cur_lang_target = $(subst @,_,$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
+cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]'))))
+cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity
+
+STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
+I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
+I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS))
+
+DEB_BUILD_PARALLEL ?= true
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
sed -e "s|.*version ||" -e "s| .*||" | \
@@ -18,91 +43,124 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
endif
-languages = `ls -1d *i18n*`
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON"
+
-build-stamp:
+build::
dh_testdir
+ dh_prep
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+build:: debian/stamp__build
+
+debian/stamp__build:
+ [ -d build ] || \
+ mkdir build
+ cd build && \
+ cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+ $(MAKE) $(DEB_MAKE_PARALLEL)
+ touch $@
+
+else
+
+build:: $(STAMP_BUILD)
+
+$(STAMP_BUILD):
+ # Building the '$(cur_lang)' language ...
+ [ -d $(cur_lang_dir)/build ] || \
+ mkdir $(cur_lang_dir)/build
+ [ -e $(cur_lang_dir)/CMakeLists.txt ] || \
+ ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
+ cd $(cur_lang_dir)/build && \
+ cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+ $(MAKE) $(DEB_MAKE_PARALLEL)
+ touch $@
- # Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+
+install::
+ dh_testdir
+ dh_testroot
+
+install:: $(I18N_INSTALL)
+ dh_testdir
+ cat debian/control-source > debian/control
+ find debian -name "control-lang-*" | LANG=C sort | xargs -r cat >> debian/control
+
+$(I18N_INSTALL): build
+ifneq "$(wildcard /usr/bin/ninja)" ""
+ [ ! -e $(cur_lang_dir)/CMakeLists.txt ] || \
+ DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) -C build install-$(cur_lang_target)
+else
+ cd $(cur_lang_dir)/build && \
+ DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL)
endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- #Configure languages.
- -for i in $(languages); do \
- cd $$i && \
- autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \
- ./configure $(configkde); \
- $(MAKE) $(DEB_MAKE_PARALLEL); \
- cd ..; \
- done
-
- touch build-stamp
-
-build: build-stamp
--include debian/debiandirs
-
-clean:
- dh_clean
+ sed -e "s|@lang@|$(cur_lang)|g" \
+ -e "s|@pkg_lang@|$(cur_pkg_lang)|g" \
+ -e "s|@lang_desc@|$$(sed -n '/^\[$(cur_lang)\]/,/^\[/s#^Name=##p' /opt/trinity/share/locale/all_languages)|" \
+ < debian/control-lang > debian/control-lang-$(cur_pkg_lang); \
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+clean: debian-clean
+
+else
+
+clean: $(I18N_CLEAN) debian-clean
+
+$(I18N_CLEAN):
dh_testdir
-
- # Remove all language directories.
- rm -rf build-stamp
- rm -rf debian/*18n*
+ rm -rf $(cur_lang_dir)/build
+
+endif
-binary-indep: build
+debian-clean:
dh_testdir
+ rm -rf build
+ rm -rf debian/$(I18N_DEST_PREFIX)-*
+ rm -f debian/stamp__*
+ rm -f debian/control-lang-*
+ cat debian/control-source > debian/control
+ sed -e "s|@lang@|all|g" \
+ -e "s|-@pkg_lang@||g" \
+ -e "s|@lang_desc@|All languages|" \
+ < debian/control-lang >> debian/control
+ dh_clean
+
+
+binary-arch: build
dh_testroot
- dh_clean -k
-
- -for i in $(languages); do \
- ( \
- cd $$i && \
- echo $$(install_dir) && \
- $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \
- cd .. \
- ) \
- done
-
-
- mkdir debian/koffice-i18n-engb-trinity
- cp -aR debian/koffice-i18n-en_GB-trinity/* debian/koffice-i18n-engb-trinity/
-
- mkdir debian/koffice-i18n-ptbr-trinity
- cp -aR debian/koffice-i18n-pt_BR-trinity/* debian/koffice-i18n-ptbr-trinity/
-
- mkdir debian/koffice-i18n-srlatin-trinity
- cp -aR debian/koffice-i18n-sr@Latn-trinity/* debian/koffice-i18n-srlatin-trinity/
-
- mkdir debian/koffice-i18n-zhcn-trinity
- cp -aR debian/koffice-i18n-zh_CN-trinity/* debian/koffice-i18n-zhcn-trinity/
-
- mkdir debian/koffice-i18n-zhtw-trinity
- cp -aR debian/koffice-i18n-zh_TW-trinity/* debian/koffice-i18n-zhtw-trinity/
-
-
- #Removing duplicate kdgantt.mo files.
- -rm -f `find . -name "kdgantt.mo"`
+ dh_testdir
+
+binary-indep: build install
+ dh_testroot
+ dh_testdir
dh_installdocs
dh_installmenu
dh_installchangelogs
- dh_strip
dh_link
+ dh_strip
+ $(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
+ dh_strip_nondeterminism)
dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
dh_fixperms
dh_installdeb
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-binary: binary-indep
-.PHONY: binary binary-indep clean
+# Below here is fairly generic really
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean build install $(I18N_INSTALL)
diff --git a/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/koffice/debian/compat b/debian/_base/applications/office/koffice/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/koffice/debian/compat
+++ b/debian/_base/applications/office/koffice/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/koffice/debian/control b/debian/_base/applications/office/koffice/debian/control
index 257b2bce7..38436d771 100644
--- a/debian/_base/applications/office/koffice/debian/control
+++ b/debian/_base/applications/office/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 9~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-all-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 10~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python3-all-dev, dh-python, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org
@@ -303,7 +303,7 @@ Section: libs
Replaces: koffice-libs-trinity (<< 4:14.0.0~)
Breaks: koffice-libs-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~)
-Recommends: latex-xft-fonts, ruby, python-all
+Recommends: latex-xft-fonts, ruby, python3-all
Suggests: wordnet, texlive-base
Description: common libraries and binaries for the Trinity Office Suite [Trinity]
This package provides the libraries and binaries that are shared amongst
diff --git a/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian b/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
index 25a8c006f..806f0020c 100644
--- a/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,2 @@
kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian b/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
index c77411ba2..888cebb0a 100644
--- a/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,2 @@
koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian b/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 74f77679d..4e0bf33b8 100644
--- a/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,2 @@
kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index 252102b05..f4a3b06c2 100644
--- a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,2 @@
kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
-
diff --git a/debian/_base/applications/office/koffice/debian/rules b/debian/_base/applications/office/koffice/debian/rules
index 397783a27..741529df1 100755
--- a/debian/_base/applications/office/koffice/debian/rules
+++ b/debian/_base/applications/office/koffice/debian/rules
@@ -27,7 +27,7 @@ DEB_INSTALL_CHANGELOGS_kugar-trinity := kugar/CHANGES
DEB_INSTALL_CHANGELOGS_kword-trinity := kword/CHANGES
DEB_INSTALL_CHANGELOGS_koffice-libs-trinity := lib/CHANGES
-DEB_COMPRESS_EXCLUDE := .ksp .kwd .kwt .docbook
+DEB_COMPRESS_EXCLUDE_ALL += .ksp .kwd .kwt .docbook
install/chalk-data-trinity::
install -m 755 -d debian/chalk-data-trinity/opt/trinity/share/apps/chalk/profiles/
diff --git a/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/kpilot/debian/compat b/debian/_base/applications/office/kpilot/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/kpilot/debian/compat
+++ b/debian/_base/applications/office/kpilot/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/kpilot/debian/control b/debian/_base/applications/office/kpilot/debian/control
index 14f205927..2fc30f8d0 100644
--- a/debian/_base/applications/office/kpilot/debian/control
+++ b/debian/_base/applications/office/kpilot/debian/control
@@ -2,7 +2,7 @@ Source: kpilot-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev
Standards-Version: 3.8.4
diff --git a/debian/_base/applications/office/kpilot/debian/docs b/debian/_base/applications/office/kpilot/debian/docs
new file mode 100644
index 000000000..960f99591
--- /dev/null
+++ b/debian/_base/applications/office/kpilot/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/office/tellico/debian/compat b/debian/_base/applications/office/tellico/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/office/tellico/debian/compat
+++ b/debian/_base/applications/office/tellico/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/office/tellico/debian/control b/debian/_base/applications/office/tellico/debian/control
index d12783adc..f06a50506 100644
--- a/debian/_base/applications/office/tellico/debian/control
+++ b/debian/_base/applications/office/tellico/debian/control
@@ -3,10 +3,10 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Regis Boudin <regis@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtdepim1-trinity-dev,
libxml2-dev, libxslt1-dev, libtag1-dev, libyaz-dev,
- libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev
+ libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev, dh-python
Standards-Version: 3.8.4
Homepage: http://periapsis.org/tellico/
@@ -31,11 +31,11 @@ Description: collection manager for books, videos, music [Trinity]
Package: tellico-data-trinity
Architecture: all
-Depends: tdelibs-data-trinity
+Depends: tdelibs-data-trinity, ${python3:Depends}
Replaces: tellico-data-trinity (<< 4:14.0.0~)
Breaks: tellico-data-trinity (<< 4:14.0.0~)
Recommends: tellico-trinity
-Suggests: python-all
+Suggests: python3-all
Description: collection manager for books, videos, music [data] [Trinity]
Tellico is a collection manager for TDE. It includes default collections for
books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -55,10 +55,11 @@ Description: collection manager for books, videos, music [data] [Trinity]
Package: tellico-scripts-trinity
Architecture: all
+Depends: ${python3:Depends}
Recommends: tellico-trinity
Replaces: tellico-scripts-trinity (<< 4:14.0.0~)
Breaks: tellico-scripts-trinity (<< 4:14.0.0~)
-Suggests: python-all, ruby
+Suggests: python3-all, ruby
Description: collection manager for books, videos, music [scripts] [Trinity]
Tellico is a collection manager for TDE. It includes default collections for
books, bibliographies, comic books, videos, music, coins, stamps, trading
diff --git a/debian/_base/applications/office/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules
index e0960f0b5..ed4736e50 100755
--- a/debian/_base/applications/office/tellico/debian/rules
+++ b/debian/_base/applications/office/tellico/debian/rules
@@ -26,3 +26,7 @@ binary-install/tellico-data-trinity::
[ ! -d debian/tmp/opt/trinity/share/mime ] || \
mv debian/tmp/opt/trinity/share/mime debian/$(cdbs_curpkg)/usr/share/
mv debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico.xml debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico-trinity.xml
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico
+
+binary-install/tellico-scripts-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico/data-sources
diff --git a/debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/kdpkg/debian/compat b/debian/_base/applications/settings/kdpkg/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/kdpkg/debian/compat
+++ b/debian/_base/applications/settings/kdpkg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/kdpkg/debian/control b/debian/_base/applications/settings/kdpkg/debian/control
index f49610832..eb8442f03 100644
--- a/debian/_base/applications/settings/kdpkg/debian/control
+++ b/debian/_base/applications/settings/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kdpkg-trinity
diff --git a/debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/kima/debian/compat b/debian/_base/applications/settings/kima/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/kima/debian/compat
+++ b/debian/_base/applications/settings/kima/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/kima/debian/control b/debian/_base/applications/settings/kima/debian/control
index 26bb8de72..0c71067be 100644
--- a/debian/_base/applications/settings/kima/debian/control
+++ b/debian/_base/applications/settings/kima/debian/control
@@ -2,7 +2,7 @@ Source: kima-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
Standards-Version: 3.8.4
diff --git a/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/kiosktool/debian/compat b/debian/_base/applications/settings/kiosktool/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/kiosktool/debian/compat
+++ b/debian/_base/applications/settings/kiosktool/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/kiosktool/debian/control b/debian/_base/applications/settings/kiosktool/debian/control
index 48f6bd9a1..7ccf337ad 100644
--- a/debian/_base/applications/settings/kiosktool/debian/control
+++ b/debian/_base/applications/settings/kiosktool/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kiosktool-trinity
diff --git a/debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/kkbswitch/debian/compat b/debian/_base/applications/settings/kkbswitch/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/kkbswitch/debian/compat
+++ b/debian/_base/applications/settings/kkbswitch/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/kkbswitch/debian/control b/debian/_base/applications/settings/kkbswitch/debian/control
index 7830b8afc..062a4acc4 100644
--- a/debian/_base/applications/settings/kkbswitch/debian/control
+++ b/debian/_base/applications/settings/kkbswitch/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev
Standards-Version: 3.7.3
Homepage: http://kkbswitch.sourceforge.net/
diff --git a/debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/klcddimmer/debian/compat b/debian/_base/applications/settings/klcddimmer/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/klcddimmer/debian/compat
+++ b/debian/_base/applications/settings/klcddimmer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/klcddimmer/debian/control b/debian/_base/applications/settings/klcddimmer/debian/control
index 14a27e356..c18e2f223 100644
--- a/debian/_base/applications/settings/klcddimmer/debian/control
+++ b/debian/_base/applications/settings/klcddimmer/debian/control
@@ -2,7 +2,7 @@ Source: klcddimmer-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.7.3
Homepage: http://klcddimeer.sourceforge.net/
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/compat b/debian/_base/applications/settings/kmyfirewall/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/kmyfirewall/debian/compat
+++ b/debian/_base/applications/settings/kmyfirewall/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control
index 5f4e568ac..79617857e 100644
--- a/debian/_base/applications/settings/kmyfirewall/debian/control
+++ b/debian/_base/applications/settings/kmyfirewall/debian/control
@@ -2,7 +2,7 @@ Source: kmyfirewall-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kmyfirewall.sourceforge.net/
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/debiandirs b/debian/_base/applications/settings/kmyfirewall/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/debian/_base/applications/settings/kmyfirewall/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/install b/debian/_base/applications/settings/kmyfirewall/debian/install
index 3a28b6931..311ed806e 100644
--- a/debian/_base/applications/settings/kmyfirewall/debian/install
+++ b/debian/_base/applications/settings/kmyfirewall/debian/install
@@ -1 +1,2 @@
debian/kmyfirewall.xpm opt/trinity/share/pixmaps
+debian/kmyfirewall-trinity/opt/trinity/share/man/man1/*
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
deleted file mode 100644
index cff01643d..000000000
--- a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
+++ /dev/null
@@ -1,162 +0,0 @@
-.TH kmyfirewall "1" "January 2004" TDE "TDE Application"
-.SH NAME
-kmyfirewall \- TDE iptables front\-end to easily create a "Personal Firewall"
-.SH SYNOPSIS
-.B kmyfirewall
-[\fIQt\-options\fR] [\fITDE\-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmyfirewall
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don\'t have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a
-Firewall that keeps the "bad" people out
-.SH OPTIONS
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "\-\-bg\fR, \fB\-\-background" \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground" \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM\-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KMyFirewall was written by
-.nh
-.ad l
-Christian Hubinger <e9806056@student.tuwien.ac.at>.
-.hy
-.br
-This manual page was prepared by
-.nh
-.ad l
-Alberto Gonzalez Iniesta <agi@inittab.org>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kmyfirewall
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kmyfirewall
-
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/manpages b/debian/_base/applications/settings/kmyfirewall/debian/manpages
deleted file mode 100644
index fab755280..000000000
--- a/debian/_base/applications/settings/kmyfirewall/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kmyfirewall.1
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules
index 8b7e87e26..76a0f44d3 100755
--- a/debian/_base/applications/settings/kmyfirewall/debian/rules
+++ b/debian/_base/applications/settings/kmyfirewall/debian/rules
@@ -12,5 +12,4 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
binary-install/kmyfirewall-trinity::
rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
chmod +x debian/$(cdbs_curpkg)/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh
diff --git a/debian/_base/applications/settings/kmyfirewall/debian/watch b/debian/_base/applications/settings/kmyfirewall/debian/watch
deleted file mode 100644
index 42dfe005b..000000000
--- a/debian/_base/applications/settings/kmyfirewall/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmyfirewall/kmyfirewall-(.*)\.tar\.bz2
diff --git a/debian/_base/applications/settings/tde-guidance/debian/README.Debian b/debian/_base/applications/settings/tde-guidance/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
- <debian-kde@lists.debian.org> mailing list
- #debian-kde on irc
-
-Packaging queries
- <debian-qt-kde@lists.debian.org> mailing list
- #debian-qt-kde on irc
-
-Maintainers
- <pkg-kde-extras@lists.alioth.debian.org> mailing list
-
-
-2. Subversion repository
-------------------------
-
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
- $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new
-release is made.
-
-When, at some point, the need to have two different versions at the same time
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and
-if a new unstable package needs to be cooked, copying
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-
- % svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-
- % svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
- % svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
- http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
- svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive. Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory. The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/debian/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..b031e6981
--- /dev/null
+++ b/debian/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl b/debian/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/settings/tde-guidance/debian/compat b/debian/_base/applications/settings/tde-guidance/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/compat
+++ b/debian/_base/applications/settings/tde-guidance/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/tde-guidance/debian/control b/debian/_base/applications/settings/tde-guidance/debian/control
index 3adabf99e..d71310222 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/control
+++ b/debian/_base/applications/settings/tde-guidance/debian/control
@@ -4,26 +4,23 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, chrpath, tdelibs14-trinity-dev,
- libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
- pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
- python-support (>= 0.6) | dh-python, python-all, python-all-dev, x11proto-scrnsaver-dev, python-tqt-dev, hwdata
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ python3-setuptools, python3-sip-tqt-dev, libpythonize0-trinity-dev, pytde-dev
Standards-Version: 3.8.4
Package: tde-guidance-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, init | sysv-rc, guidance-backends-trinity, hwdata, python-all, python-all-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, guidance-backends-trinity, python3-all, python3-all-dev
Replaces: kde-guidance-trinity (<< 4:14.0.0~)
Breaks: kde-guidance-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
Description: collection of TDE system administration tools for GNU/Linux [Trinity]
- Guidance currently consists of four programs designed to help you
+ Guidance currently consists of three programs designed to help you
look after your system:
o userconfig - User and Group administration
o serviceconfig - Service/daemon administration
o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
.
These tools are available in Trinity Control Center, System Settings
or can be run as standalone applications.
@@ -32,11 +29,11 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
Package: guidance-backends-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python-all, python-all-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-all, python3-all-dev
Replaces: guidance-backends-trinity (<< 4:14.0.0~)
Breaks: guidance-backends-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
Description: collection of system administration tools for GNU/Linux [Trinity]
This package contains the platform neutral backends used in the
Guidance configuration tools.
diff --git a/debian/_base/applications/settings/tde-guidance/debian/docs b/debian/_base/applications/settings/tde-guidance/debian/docs
deleted file mode 100644
index 724e08449..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-TODO
diff --git a/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
index d292fc8d3..d9e850d6c 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
+++ b/debian/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
@@ -1,3 +1 @@
-opt/trinity/share/python-support/guidance-backends-trinity/MicroHAL.py
-opt/trinity/share/python-support/guidance-backends-trinity/wineread.py
-opt/trinity/share/python-support/guidance-backends-trinity/winewrite.py
+/usr/lib/python*/dist-packages/tde-guidance/MicroHAL.py
diff --git a/debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
deleted file mode 100644
index d3076cc3c..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.TH "MOUNTCONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-mountconfig \- disk and filesystem administration tool
-.SH "SYNOPSIS"
-.B mountconfig
-.RI [ options ]
-.br
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B mountconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBmountconfig\fP is a disk and filesystem administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR serviceconfig (1),
-.BR userconfig (1).
-.br
-.SH "AUTHOR"
-mountconfig was written by <simon@simonzone.com>.
-.PP
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/debian/_base/applications/settings/tde-guidance/debian/pycompat b/debian/_base/applications/settings/tde-guidance/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk b/debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
deleted file mode 100644
index 1a1ec9a8e..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-# This class is designed to work with Python packages using the
-# 'distutils' build system and comply to the new policy established
-# during summer 2006. Use of the debhelper class to make use of the
-# new dh_python is strongly advised. (This is still left as optional
-# in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy. Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and
-# pycentral methods are available to comply with new policy. Don't forget
-# to update your 'debian/control'. (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- # warning pysupport compatibility mode
- ifneq (, $(cdbs_use_xs_field))
- $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
- endif # use XS field (compat)
-else
- ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- else
- ifneq (, $(DEB_PYTHON_SYSTEM))
- $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
- else
- ifneq (, $(cdbs_use_xs_field))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- ifneq (, $(cdbs_selected_pycompat))
- ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- endif # use pycompat
- endif # unknown method
- endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating. Here is some documentation:)
-$(warning http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'. Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
- for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
- for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule. In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% :
- -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
- # check if current is in build versions
- ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
- cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
- cdbs_python_build_versions := $(cdbs_python_compile_version)
- else
- cdbs_python_build_versions := $(cdbs_python_current_version)
- endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
- ifneq (, $(cdbs_python_compile_version))
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
- else
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
- endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
- touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# This class can optionally use debhelper's commands. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-else
- dh_pycentral -p$(cdbs_curpkg)
-endif
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
- echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
- rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
- find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/debian/_base/applications/settings/tde-guidance/debian/pyversions b/debian/_base/applications/settings/tde-guidance/debian/pyversions
deleted file mode 100644
index 0c043f18c..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.6-
diff --git a/debian/_base/applications/settings/tde-guidance/debian/rules b/debian/_base/applications/settings/tde-guidance/debian/rules
index 28dfb8c47..a6797f19a 100755
--- a/debian/_base/applications/settings/tde-guidance/debian/rules
+++ b/debian/_base/applications/settings/tde-guidance/debian/rules
@@ -1,170 +1,17 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
-PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
-GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
-export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
-
include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- include debian/python-distutils-jaunty.mk
-else
- include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_UPDATE_RCD_PARAMS := multiuser
-DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-LDFLAGS_APPEND := -L/opt/trinity/lib
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-post-patches::
- # make sure that python binary exists
- # since the existing code is still dependent on python2
- # and cdbs uses python as the default binary name
- test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-install/tde-guidance-trinity::
- # install icons to right place
- install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
- install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kcmpartitions.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
- install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-user.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/32-wine.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/daemons.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/userconfig.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
- install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png \
- $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
-
- # install lintian overrides
- install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \
- $(DEB_DESTDIR)/usr/share/lintian/overrides/tde-guidance-trinity
-
- # fix binary-or-shlib-defines-rpath
- chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so*
-
- # fix executable-not-elf-or-script
- chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-
- # fix the link properly
- mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
-
- # move python modules in PYSUPPORT_PATH
- mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-# cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
-
- # fix script-not-executable
- chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/fuser.py
-# chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/grubconfig.py
-
- : # Replace all '#!' calls to python with /usr/bin/python
- : # and make them executable
- for i in `find debian/tde-guidance-trinity -type f`; do \
- sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
- $$i > $$i.temp; \
- if cmp --quiet $$i $$i.temp; then \
- rm -f $$i.temp; \
- else \
- mv -f $$i.temp $$i; \
- chmod 755 $$i; \
- echo "fixed interpreter: $$i"; \
- fi; \
- done
-
-install/guidance-backends-trinity::
- mkdir -p $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
- cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-
-clean::
- rm -rf build
-
- rm -rf doc/en/*html doc/en/*bz2
- rm -f serviceconfig/kcm_serviceconfig.cpp
- rm -f mountconfig/kcm_mountconfig.cpp
- rm -f displayconfig/kcm_displayconfig.cpp
- rm -f userconfig/kcm_userconfig.cpp
- rm -f install_log.txt
- rm -f po/*.gmo
- rm -f po/*.pot
-
- # clean up edited .desktop etc files
- if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
- sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
- for file in `cat LIST`; do \
- sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \
- done; \
- rm -f LIST; \
- fi
-
-common-install-prehook-impl::
- # generate form implementation using pytde user interface compiler
-
- mkdir -p po
- touch list
- find -name "*.py" >> list
- xgettext -ki18n -LPython -flist -o po/guidance.pot
- rm list
-
- for file in po/*pot; do \
- sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
- done
-
- # generate .po files for .desktop etc files
- if [ -z $${KUBUNTU_DESKTOP_POT} ]; then \
- KUBUNTU_DESKTOP_POT=$(DEB_SOURCE_PACKAGE); \
- fi; \
- echo KUBUNTU_DESKTOP_POT: $${KUBUNTU_DESKTOP_POT}; \
- if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
- sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
- cat LIST; \
- perl /usr/lib/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
- msguniq --to-code=UTF-8 --no-wrap -o desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null; \
- python /usr/lib/kubuntu-desktop-i18n/msgsplit desktop.$${KUBUNTU_DESKTOP_POT}; \
- mv desktop.$${KUBUNTU_DESKTOP_POT} po/desktop_$${KUBUNTU_DESKTOP_POT}.pot; \
- rm -f desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
- # add translation domain to files \
- for file in `cat LIST`; do \
- echo X-Ubuntu-Gettext-Domain=desktop_$${KUBUNTU_DESKTOP_POT} >> $${file}; \
- done; \
- rm -f LIST; \
- fi
-
- rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
deleted file mode 100644
index 8ef180de8..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.TH "SERVICECONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-serviceconfig \- Service/daemon administration tool
-.SH "SYNOPSIS"
-.B serviceconfig
-.RI [ options ]
-.br
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B serviceconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBserviceconfig\fP is a service/daemon administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR mountconfig (1),
-.BR userconfig (1).
-.br
-.SH "AUTHOR"
-serviceconfig was written by <simon@simonzone.com>.
-.PP
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
index e6a81f4d4..d39b3faac 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
+++ b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,68 +1,16 @@
-opt/trinity/lib/trinity/kcm_serviceconfig.la
-opt/trinity/lib/trinity/kcm_userconfig.la
-opt/trinity/lib/trinity/kcm_mountconfig.la
-opt/trinity/lib/trinity/kcm_wineconfig.la
-opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png
-opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
-opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
-opt/trinity/share/doc/tde/HTML/en/guidance/index.html
-opt/trinity/share/applications/tde/serviceconfig.desktop
-opt/trinity/share/applications/tde/userconfig.desktop
-opt/trinity/share/applications/tde/mountconfig.desktop
-opt/trinity/share/applications/tde/wineconfig.desktop
-opt/trinity/share/apps/guidance/pics/laserwarn.png
-opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
-opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
-opt/trinity/share/apps/guidance/pics/hi32-user.png
-opt/trinity/share/apps/guidance/pics/hi32-group.png
-opt/trinity/share/apps/guidance/pics/hi32-identity.png
-opt/trinity/share/apps/guidance/pics/hi32-password.png
-opt/trinity/share/apps/guidance/pics/kcmpartitions.png
-opt/trinity/share/apps/guidance/pics/trinity1.png
-opt/trinity/share/apps/guidance/pics/trinity2.png
-opt/trinity/share/apps/guidance/pics/trinity3.png
-opt/trinity/share/apps/guidance/pics/trinity4.png
-opt/trinity/share/apps/guidance/pics/trinity5.png
-opt/trinity/share/apps/guidance/pics/trinity6.png
-opt/trinity/share/apps/guidance/pics/hi32-samba.png
-opt/trinity/share/apps/guidance/pics/hi16-hdd.png
-opt/trinity/share/apps/guidance/pics/hi16-cdrom.png
-opt/trinity/share/apps/guidance/pics/hi16-burner.png
-opt/trinity/share/apps/guidance/pics/hi16-floppy.png
-opt/trinity/share/apps/guidance/pics/hi16-blockdevice.png
-opt/trinity/share/apps/guidance/pics/hi16-password.png
-opt/trinity/share/apps/guidance/pics/hi16-memory.png
-opt/trinity/share/apps/guidance/pics/hi16-network.png
-opt/trinity/share/apps/guidance/pics/hi16-lock.png
-opt/trinity/share/apps/guidance/pics/hi16-usbpen.png
-opt/trinity/share/apps/guidance/pics/greenled.png
-opt/trinity/share/apps/guidance/pics/greyled.png
-opt/trinity/share/apps/guidance/pics/exec.png
-opt/trinity/share/apps/guidance/pics/file.png
-opt/trinity/share/apps/guidance/pics/important.png
-opt/trinity/share/apps/guidance/pics/tux.png
-opt/trinity/share/apps/guidance/pics/user.png
-opt/trinity/share/apps/guidance/pics/32-wine.png
-opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-opt/trinity/share/python-support/tde-guidance-trinity/SMBShareSelectDialog.py
-opt/trinity/share/python-support/tde-guidance-trinity/SimpleCommandRunner.py
-opt/trinity/share/python-support/tde-guidance-trinity/fuser.py
-opt/trinity/share/python-support/tde-guidance-trinity/fuser_ui.py
-#opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
-opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
-opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
-opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
-opt/trinity/lib/trinity/kcm_serviceconfig.so
-opt/trinity/lib/trinity/kcm_userconfig.so
-opt/trinity/lib/trinity/kcm_mountconfig.so
-opt/trinity/lib/trinity/kcm_wineconfig.so
-usr/share/lintian/overrides/tde-guidance-trinity
+opt/trinity/bin
+opt/trinity/lib/trinity
+opt/trinity/share/applications/tde
+opt/trinity/share/apps/guidance/pics
+opt/trinity/share/doc
+opt/trinity/share/icons/crystalsvg
+opt/trinity/share/man/man1
+usr/lib/python*/dist-packages/tde-guidance/SMBShareSelectDialog.py
+usr/lib/python*/dist-packages/tde-guidance/SimpleCommandRunner.py
+usr/lib/python*/dist-packages/tde-guidance/fuser.py
+usr/lib/python*/dist-packages/tde-guidance/fuser_ui.py
+usr/lib/python*/dist-packages/tde-guidance/mountconfig.py
+usr/lib/python*/dist-packages/tde-guidance/serviceconfig.py
+usr/lib/python*/dist-packages/tde-guidance/sizeview.py
+usr/lib/python*/dist-packages/tde-guidance/unixauthdb.py
+usr/lib/python*/dist-packages/tde-guidance/userconfig.py
diff --git a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
index f151ee69f..e83480662 100644
--- a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
+++ b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
@@ -1,4 +1,2 @@
# false positive warnings from lintian
-tde-guidance-trinity: postinst-has-useless-call-to-ldconfig
-tde-guidance-trinity: postrm-has-useless-call-to-ldconfig
tde-guidance-trinity: package-has-a-duplicate-relation depends
diff --git a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst b/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
deleted file mode 100644
index af8e365b5..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Remove shutdown and reboot links; this init script does not need them.
-rm -f /etc/rc0.d/K20tde-guidance /etc/rc6.d/K20tde-guidance
-
-#remove script from older times
-update-rc.d -f displayconfig-hwprobe.py remove
-
-#DEBHELPER#
diff --git a/debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 b/debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
deleted file mode 100644
index 1fda3dd19..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.TH "USERCONFIG" "1" "aout 2, 2005" "" ""
-.SH "NAME"
-userconfig \- user and group administration tool
-.SH "SYNOPSIS"
-.B userconfig
-.RI [ options ]
-.br
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B userconfig
-commands. This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBuserconfig\fP is an user and group administration tool.
-.SH "OPTIONS"
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`\-').
-A summary of options is included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show program license.
-.SH "SEE ALSO"
-.BR displayconfig (1),
-.BR displayconfig-restore (1),
-.BR mountconfig (1),
-.BR serviceconfig (1).
-.br
-.SH "AUTHOR"
-userconfig was written by <simon@simonzone.com>.
-.PP
-This manual page was written by Fathi Boudra <fboudra@free.fr>,
-for the Debian project (but may be used by others).
diff --git a/debian/_base/applications/settings/tde-guidance/debian/watch b/debian/_base/applications/settings/tde-guidance/debian/watch
deleted file mode 100644
index 19912c171..000000000
--- a/debian/_base/applications/settings/tde-guidance/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/compat b/debian/_base/applications/settings/tde-systemsettings/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/tde-systemsettings/debian/compat
+++ b/debian/_base/applications/settings/tde-systemsettings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/control b/debian/_base/applications/settings/tde-systemsettings/debian/control
index 8231f6a84..fe6491952 100644
--- a/debian/_base/applications/settings/tde-systemsettings/debian/control
+++ b/debian/_base/applications/settings/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/compat b/debian/_base/applications/settings/tdenetworkmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/tdenetworkmanager/debian/compat
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/control b/debian/_base/applications/settings/tdenetworkmanager/debian/control
index 4c0fef881..6034eb322 100644
--- a/debian/_base/applications/settings/tdenetworkmanager/debian/control
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/control
@@ -2,8 +2,8 @@ Source: tdenetworkmanager-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
- cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt,
+ tde-cmake, ninja-build,
tdelibs14-trinity-dev,
libiw-dev,
libnl-3-dev | libnl-dev (>= 1.1)
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..93aadf394 100644
--- a/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
@@ -1,5 +1,3 @@
network-manager-tde: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdenetworkmanager.so
network-manager-tde: package-name-doesnt-match-sonames libtdeinit-tdenetworkmanager
-network-manager-tde: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
-network-manager-tde: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst b/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
deleted file mode 100644
index df7b9dba2..000000000
--- a/debian/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postinst script for network-manager-tde
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/tdesudo/debian/compat b/debian/_base/applications/settings/tdesudo/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/tdesudo/debian/compat
+++ b/debian/_base/applications/settings/tdesudo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/tdesudo/debian/control b/debian/_base/applications/settings/tdesudo/debian/control
index f8fe7f88d..51be5319f 100644
--- a/debian/_base/applications/settings/tdesudo/debian/control
+++ b/debian/_base/applications/settings/tdesudo/debian/control
@@ -2,7 +2,7 @@ Source: tdesudo-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdesudo-trinity
diff --git a/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/settings/wlassistant/debian/compat b/debian/_base/applications/settings/wlassistant/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/settings/wlassistant/debian/compat
+++ b/debian/_base/applications/settings/wlassistant/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/settings/wlassistant/debian/control b/debian/_base/applications/settings/wlassistant/debian/control
index a9a789b08..35928af9a 100644
--- a/debian/_base/applications/settings/wlassistant/debian/control
+++ b/debian/_base/applications/settings/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
Standards-Version: 3.8.4
Package: wlassistant-trinity
diff --git a/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/dolphin/debian/compat b/debian/_base/applications/system/dolphin/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/dolphin/debian/compat
+++ b/debian/_base/applications/system/dolphin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/dolphin/debian/control b/debian/_base/applications/system/dolphin/debian/control
index 27010213b..b865384f2 100644
--- a/debian/_base/applications/system/dolphin/debian/control
+++ b/debian/_base/applications/system/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
Standards-Version: 3.8.4
Package: dolphin-trinity
diff --git a/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/katapult/debian/compat b/debian/_base/applications/system/katapult/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/katapult/debian/compat
+++ b/debian/_base/applications/system/katapult/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/katapult/debian/control b/debian/_base/applications/system/katapult/debian/control
index f76a593dd..a7d9ba669 100644
--- a/debian/_base/applications/system/katapult/debian/control
+++ b/debian/_base/applications/system/katapult/debian/control
@@ -2,7 +2,7 @@ Source: katapult-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxi-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev
Standards-Version: 3.8.4
Package: katapult-trinity
diff --git a/debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kbfx/debian/compat b/debian/_base/applications/system/kbfx/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kbfx/debian/compat
+++ b/debian/_base/applications/system/kbfx/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kbfx/debian/control b/debian/_base/applications/system/kbfx/debian/control
index cbfb40654..64a95bb91 100644
--- a/debian/_base/applications/system/kbfx/debian/control
+++ b/debian/_base/applications/system/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kbfx-trinity
diff --git a/debian/_base/applications/system/kbfx/debian/postinst b/debian/_base/applications/system/kbfx/debian/postinst
deleted file mode 100644
index e95a6906b..000000000
--- a/debian/_base/applications/system/kbfx/debian/postinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# postinst script for kbfx
-
-set -e
-
-case "$1" in
- configure)
- ldconfig
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kcmautostart/debian/compat b/debian/_base/applications/system/kcmautostart/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kcmautostart/debian/compat
+++ b/debian/_base/applications/system/kcmautostart/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kcmautostart/debian/control b/debian/_base/applications/system/kcmautostart/debian/control
index 32c10296f..cf5da73c2 100644
--- a/debian/_base/applications/system/kcmautostart/debian/control
+++ b/debian/_base/applications/system/kcmautostart/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-autostart-trinity
diff --git a/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kdbusnotification/debian/compat b/debian/_base/applications/system/kdbusnotification/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kdbusnotification/debian/compat
+++ b/debian/_base/applications/system/kdbusnotification/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kdbusnotification/debian/control b/debian/_base/applications/system/kdbusnotification/debian/control
index e5e6d5469..bfebf027e 100644
--- a/debian/_base/applications/system/kdbusnotification/debian/control
+++ b/debian/_base/applications/system/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
Standards-Version: 3.8.4
Package: kdbusnotification-trinity
diff --git a/debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/klamav/debian/compat b/debian/_base/applications/system/klamav/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/klamav/debian/compat
+++ b/debian/_base/applications/system/klamav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/klamav/debian/control b/debian/_base/applications/system/klamav/debian/control
index 6e37ec7ee..833f05123 100644
--- a/debian/_base/applications/system/klamav/debian/control
+++ b/debian/_base/applications/system/klamav/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Scott Kitterman <scott@kitterman.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~)
Standards-Version: 3.8.4
Package: klamav-trinity
diff --git a/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/knemo/debian/compat b/debian/_base/applications/system/knemo/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/knemo/debian/compat
+++ b/debian/_base/applications/system/knemo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/knemo/debian/control b/debian/_base/applications/system/knemo/debian/control
index 902135c64..7a2e176ab 100644
--- a/debian/_base/applications/system/knemo/debian/control
+++ b/debian/_base/applications/system/knemo/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libiw-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev
Standards-Version: 3.8.4
Package: knemo-trinity
diff --git a/debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/knetload/debian/compat b/debian/_base/applications/system/knetload/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/knetload/debian/compat
+++ b/debian/_base/applications/system/knetload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/knetload/debian/control b/debian/_base/applications/system/knetload/debian/control
index 4b01c7e3d..befc4403d 100644
--- a/debian/_base/applications/system/knetload/debian/control
+++ b/debian/_base/applications/system/knetload/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2)
Standards-Version: 3.8.4
Package: knetload-trinity
diff --git a/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/knetstats/debian/compat b/debian/_base/applications/system/knetstats/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/knetstats/debian/compat
+++ b/debian/_base/applications/system/knetstats/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/knetstats/debian/control b/debian/_base/applications/system/knetstats/debian/control
index 543bfb900..71d7b8b56 100644
--- a/debian/_base/applications/system/knetstats/debian/control
+++ b/debian/_base/applications/system/knetstats/debian/control
@@ -2,7 +2,7 @@ Source: knetstats-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://knetstats.sourceforge.net/
diff --git a/debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kooldock/debian/compat b/debian/_base/applications/system/kooldock/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kooldock/debian/compat
+++ b/debian/_base/applications/system/kooldock/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kooldock/debian/control b/debian/_base/applications/system/kooldock/debian/control
index 9af925609..8ad561f40 100644
--- a/debian/_base/applications/system/kooldock/debian/control
+++ b/debian/_base/applications/system/kooldock/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.0
Homepage: http://sourceforge.net/projects/kooldock/
diff --git a/debian/_base/applications/system/kooldock/debian/docs b/debian/_base/applications/system/kooldock/debian/docs
index c17f03764..76c3076c9 100644
--- a/debian/_base/applications/system/kooldock/debian/docs
+++ b/debian/_base/applications/system/kooldock/debian/docs
@@ -1,4 +1,3 @@
AUTHORS
-NEWS
-README
+README.md
TODO
diff --git a/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/krusader/debian/compat b/debian/_base/applications/system/krusader/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/krusader/debian/compat
+++ b/debian/_base/applications/system/krusader/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control
index 10ff438f0..b86b108c6 100644
--- a/debian/_base/applications/system/krusader/debian/control
+++ b/debian/_base/applications/system/krusader/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://krusader.sourceforge.net
diff --git a/debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kshutdown/debian/compat b/debian/_base/applications/system/kshutdown/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kshutdown/debian/compat
+++ b/debian/_base/applications/system/kshutdown/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kshutdown/debian/control b/debian/_base/applications/system/kshutdown/debian/control
index 96b27b2e7..ef9690fce 100644
--- a/debian/_base/applications/system/kshutdown/debian/control
+++ b/debian/_base/applications/system/kshutdown/debian/control
@@ -2,7 +2,7 @@ Source: kshutdown-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.1
Package: kshutdown-trinity
diff --git a/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/ksystemlog/debian/compat b/debian/_base/applications/system/ksystemlog/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/ksystemlog/debian/compat
+++ b/debian/_base/applications/system/ksystemlog/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/ksystemlog/debian/control b/debian/_base/applications/system/ksystemlog/debian/control
index 0f7cf8a92..4bc0f103b 100644
--- a/debian/_base/applications/system/ksystemlog/debian/control
+++ b/debian/_base/applications/system/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: ksystemlog-trinity
diff --git a/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/kvkbd/debian/compat b/debian/_base/applications/system/kvkbd/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/kvkbd/debian/compat
+++ b/debian/_base/applications/system/kvkbd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/kvkbd/debian/control b/debian/_base/applications/system/kvkbd/debian/control
index a7aa4aa6c..647e5fb91 100644
--- a/debian/_base/applications/system/kvkbd/debian/control
+++ b/debian/_base/applications/system/kvkbd/debian/control
@@ -2,7 +2,7 @@ Source: kvkbd-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libxtst-dev, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libxtst-dev, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://pan4os.info/main/index.php
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/compat b/debian/_base/applications/system/polkit-agent-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/polkit-agent-tde/debian/compat
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/control b/debian/_base/applications/system/polkit-agent-tde/debian/control
index 645e7ec1e..7fb2e0d3b 100644
--- a/debian/_base/applications/system/polkit-agent-tde/debian/control
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
Standards-Version: 3.9.4
Section: libs
diff --git a/debian/_base/applications/system/smartcardauth/debian/compat b/debian/_base/applications/system/smartcardauth/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/smartcardauth/debian/compat
+++ b/debian/_base/applications/system/smartcardauth/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control
index a034b10be..97c6fb93e 100644
--- a/debian/_base/applications/system/smartcardauth/debian/control
+++ b/debian/_base/applications/system/smartcardauth/debian/control
@@ -2,7 +2,7 @@ Source: smartcardauth
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/tastymenu/debian/compat b/debian/_base/applications/system/tastymenu/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/tastymenu/debian/compat
+++ b/debian/_base/applications/system/tastymenu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/tastymenu/debian/control b/debian/_base/applications/system/tastymenu/debian/control
index e45a57ac9..3b1ca1154 100644
--- a/debian/_base/applications/system/tastymenu/debian/control
+++ b/debian/_base/applications/system/tastymenu/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Marco Martin <notmart@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxau-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxau-dev
Standards-Version: 3.8.0
Package: tastymenu-trinity
diff --git a/debian/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/system/tdebluez/debian/cdbs/versions.pl b/debian/_base/applications/system/tdebluez/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/system/tdebluez/debian/changelog b/debian/_base/applications/system/tdebluez/debian/changelog
new file mode 100644
index 000000000..d779b284e
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/changelog
@@ -0,0 +1,12 @@
+tdebluez-trinity (4:14.1.0-0debian10.1.1+eko1) unstable; urgency=low
+
+ * Build for buster.
+
+ -- Emanoil Kotsev <deloptes@gmail.com> Sat, 02 Nov 2019 22:00:00 +0100
+
+tdebluez (4:14.1.0-0debian9.0.5+eko1) unstable; urgency=low
+
+ * Rework of Dbus interface to Bluez5 for TDE 14.1.
+
+ -- Emanoil Kotsev <deloptes@gmail.com> Sat, 29 Sep 2018 22:00:00 +0100
+
diff --git a/debian/_base/applications/system/tdebluez/debian/compat b/debian/_base/applications/system/tdebluez/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/applications/system/tdebluez/debian/control b/debian/_base/applications/system/tdebluez/debian/control
new file mode 100644
index 000000000..dcfa46b04
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/control
@@ -0,0 +1,76 @@
+Source: tdebluez-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-1-tqt-dev
+Build-Depends-Indep: doxygen, graphviz
+Standards-Version: 3.8.0
+
+Package: tdebluez-trinity
+Section: tde
+Architecture: any
+Depends: ${shlibs:Depends}, bluez (>= 5~), bluez-obexd (>= 5~)
+Suggests: pulseaudio-module-bluetooth
+Description: TDE Bluetooth Framework
+ The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
+ stack BlueZ5. It provides easy access to the most common Bluetooth profiles and
+ makes data exchange with Bluetooth devices like phones and PDAs as
+ straightforward as possible.
+ .
+ Features:
+ * tdebluez -- a tray applet to handle incoming inquiries and control
+ adapters and devices
+ * tdebluezauth -- authentication agent
+ * tdeioclient -- cli to obex
+
+Package: libtdebluez-trinity
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, bluez (>= 5~)
+Description: Bluetooth library for TDE
+ This package is part of the TDE Bluetooth Framework.
+ It contains a Bluetooth library for TDE.
+ .
+ See the 'tdebluez-trinity' package for more informations.
+
+Package: libtdeobex-trinity
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, bluez-obexd (>= 5~)
+Description: Obex library for TDE
+ This package is part of the TDE Bluetooth Framework.
+ It contains a Bluetooth library for TDE.
+ .
+ See the 'tdebluez-trinity' package for more informations.
+
+Package: libtdebluez-trinity-dev
+Architecture: any
+Section: libdevel
+Depends: libtdebluez-trinity (= ${binary:Version})
+Description: development files for libtdebluez
+ This package is part of the TDE Bluetooth Framework.
+ It contains the development files for libtdebluez.
+ .
+ See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations.
+
+Package: libtdeobex-trinity-dev
+Architecture: any
+Section: libdevel
+Depends: libtdeobex-trinity (= ${binary:Version})
+Description: development files for libtdeobex
+ This package is part of the TDE Bluetooth Framework.
+ It contains the development files for libtdeobex.
+ .
+ See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations.
+
+Package: tdebluez-trinity-api-doc
+Section: doc
+Architecture: all
+Description: developer documentation for the libtdebluez-trinity and libtdeobex-trinity libraries
+ This package contains documentation for the libtdebluez-trinity and libtdeobex-trinity libraries of
+ use more for developers creating applications which use the libtdebluez-trinity and libtdeobex-trinity
+ libraries, than regular users.
+ .
+ This package is part of the provided bindings for the Trinity TQt interface.
+ .
+ See the tdebluez-trinity description for more information about tdebluez in general.
diff --git a/debian/_base/applications/system/tdebluez/debian/copyright b/debian/_base/applications/system/tdebluez/debian/copyright
new file mode 100644
index 000000000..7fc5c091b
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/copyright
@@ -0,0 +1,43 @@
+This package was debianized by Emanoil Kotsev <deloptes@gmail.com>
+on Fri, 19 Sep 2003 18:47:31 +0200.
+
+It was downloaded from http://bluetooth.kmobiletools.org
+
+Ported to TDE by Emanoil Kotsev <deloptes@gmail.com>
+on Tue, 22 Nov 2016 17:23:21 +0100.
+
+Upstream Authors:
+
+ Emanoil Kotsev <deloptes@gmail.com>
+
+Copyright:
+
+ (C) 2018 Emanoil Kotsev <deloptes@gmail.com>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The documentations provided with kdebluetooth is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
+
diff --git a/debian/_base/applications/system/tdebluez/debian/docs b/debian/_base/applications/system/tdebluez/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install b/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install
new file mode 100644
index 000000000..6425a944e
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install
@@ -0,0 +1,3 @@
+opt/trinity/include/tdebluez/*
+opt/trinity/lib/libtdebluez.so
+opt/trinity/share/cmake/libtdebluez.cmake
diff --git a/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install b/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install
new file mode 100644
index 000000000..72a1ac2a2
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install
@@ -0,0 +1,2 @@
+opt/trinity/lib/libtdebluez.la
+opt/trinity/lib/libtdebluez.so.*
diff --git a/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install b/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install
new file mode 100644
index 000000000..e60909e04
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install
@@ -0,0 +1,3 @@
+opt/trinity/include/tdeobex/*
+opt/trinity/lib/libtdeobex.so
+opt/trinity/share/cmake/libtdeobex.cmake
diff --git a/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install b/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install
new file mode 100644
index 000000000..2557b6e5f
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install
@@ -0,0 +1,2 @@
+opt/trinity/lib/libtdeobex.la
+opt/trinity/lib/libtdeobex.so.*
diff --git a/debian/_base/applications/system/tdebluez/debian/rules b/debian/_base/applications/system/tdebluez/debian/rules
new file mode 100755
index 000000000..9c17d4c4c
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_KDE_APIDOX := yes
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/misc/fusion-icon/debian/source/format b/debian/_base/applications/system/tdebluez/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/misc/fusion-icon/debian/source/format
+++ b/debian/_base/applications/system/tdebluez/debian/source/format
diff --git a/debian/_base/applications/misc/fusion-icon/debian/source/options b/debian/_base/applications/system/tdebluez/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/misc/fusion-icon/debian/source/options
+++ b/debian/_base/applications/system/tdebluez/debian/source/options
diff --git a/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install b/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install
new file mode 100644
index 000000000..50a3931d0
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/tdebluez-trinity-api/HTML/en/*
diff --git a/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity.install b/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity.install
new file mode 100644
index 000000000..80063c949
--- /dev/null
+++ b/debian/_base/applications/system/tdebluez/debian/tdebluez-trinity.install
@@ -0,0 +1,27 @@
+opt/trinity/bin/tdebluez
+opt/trinity/bin/tdebluezauth
+opt/trinity/bin/tdebluezioclient
+opt/trinity/lib/trinity/tdebluez.so
+opt/trinity/lib/trinity/tdebluez.la
+opt/trinity/lib/libtdeinit_tdebluez.so
+opt/trinity/lib/libtdeinit_tdebluez.la
+opt/trinity/lib/trinity/tdeio_bluetooth.so
+opt/trinity/lib/trinity/tdeio_bluetooth.la
+opt/trinity/lib/trinity/tdeio_obex.so
+opt/trinity/lib/trinity/tdeio_obex.la
+opt/trinity/share/apps/tdebluez/icons/*
+opt/trinity/share/doc/tde/HTML/*
+opt/trinity/share/apps/tdebluez/eventsrc
+opt/trinity/share/apps/tdebluez/tde-settings-network-bluetooth.directory
+opt/trinity/share/applications/tde/tdebluez.desktop
+opt/trinity/share/applications/tde/tdebluezauth.desktop
+opt/trinity/share/autostart/tdebluez.autostart.desktop
+opt/trinity/share/icons
+opt/trinity/share/locale
+opt/trinity/share/mimelnk/bluetooth/*
+opt/trinity/share/services/bluetooth.protocol
+opt/trinity/share/services/obexftp.protocol
+opt/trinity/share/services/obexopp.protocol
+opt/trinity/share/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
+opt/trinity/share/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop
+/etc/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
diff --git a/debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/tdedocker/debian/compat b/debian/_base/applications/system/tdedocker/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/tdedocker/debian/compat
+++ b/debian/_base/applications/system/tdedocker/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/tdedocker/debian/control b/debian/_base/applications/system/tdedocker/debian/control
index c2bc9a5c0..c21879563 100644
--- a/debian/_base/applications/system/tdedocker/debian/control
+++ b/debian/_base/applications/system/tdedocker/debian/control
@@ -2,7 +2,7 @@ Source: tdedocker-trinity
Section: x11
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxpm-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxpm-dev
Standards-Version: 3.7.2
Package: tdedocker-trinity
diff --git a/debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/tdepowersave/debian/compat b/debian/_base/applications/system/tdepowersave/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/tdepowersave/debian/compat
+++ b/debian/_base/applications/system/tdepowersave/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/tdepowersave/debian/control b/debian/_base/applications/system/tdepowersave/debian/control
index 4a715d99b..b0b75e675 100644
--- a/debian/_base/applications/system/tdepowersave/debian/control
+++ b/debian/_base/applications/system/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
Standards-Version: 3.8.4
Homepage: http://sourceforge.net/projects/powersave/
diff --git a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
index e27c64261..f89a3be85 100644
--- a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
+++ b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -1,5 +1,3 @@
tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
-tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
-tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
diff --git a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
deleted file mode 100644
index a00246bd9..000000000
--- a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdepowersave-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
index 5b4e8bfd7..aba508624 100644
--- a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
@@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
endif
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
endif
@@ -73,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -193,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
@@ -214,7 +228,7 @@ debian/stamp-kde-apidox:
common-install-indep:: common-install-kde-apidox
common-install-kde-apidox::
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
cleanbuilddir::
-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/compat b/debian/_base/applications/system/tdesshaskpass/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/tdesshaskpass/debian/compat
+++ b/debian/_base/applications/system/tdesshaskpass/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/control b/debian/_base/applications/system/tdesshaskpass/debian/control
index dd6674b51..02382a5e9 100644
--- a/debian/_base/applications/system/tdesshaskpass/debian/control
+++ b/debian/_base/applications/system/tdesshaskpass/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Armin Berres <trigger+debian@space-based.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.0
Package: tdesshaskpass-trinity
diff --git a/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/system/yakuake/debian/compat b/debian/_base/applications/system/yakuake/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/system/yakuake/debian/compat
+++ b/debian/_base/applications/system/yakuake/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/system/yakuake/debian/control b/debian/_base/applications/system/yakuake/debian/control
index 50189d1c7..ec4141886 100644
--- a/debian/_base/applications/system/yakuake/debian/control
+++ b/debian/_base/applications/system/yakuake/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://extragear.kde.org/apps/yakuake/
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/control b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
index b5c61299d..3b616818e 100644
--- a/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-appinfo-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/compat b/debian/_base/applications/tdeio/tdeio-apt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-apt/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-apt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/control b/debian/_base/applications/tdeio/tdeio-apt/debian/control
index 11f3f9b0a..40ba4d9a5 100644
--- a/debian/_base/applications/tdeio/tdeio-apt/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-apt/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-apt-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/compat b/debian/_base/applications/tdeio/tdeio-ftps/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-ftps/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/control b/debian/_base/applications/tdeio/tdeio-ftps/debian/control
index d1455f685..feb19c97d 100644
--- a/debian/_base/applications/tdeio/tdeio-ftps/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.3
Package: tdeio-ftps-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/compat b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/control b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
index 2752551e6..578f51c5a 100644
--- a/debian/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-gopher-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/compat b/debian/_base/applications/tdeio/tdeio-locate/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/control b/debian/_base/applications/tdeio/tdeio-locate/debian/control
index 038d8ec01..aa71bd264 100644
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, bzip2, python-all
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-locate-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
index b9e54f6a9..a6797f19a 100755
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -1,33 +1,17 @@
#!/usr/bin/make -f
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_KDE_APIDOX := yes
-
-CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
-
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/compat b/debian/_base/applications/tdeio/tdeio-sword/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-sword/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-sword/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/control b/debian/_base/applications/tdeio/tdeio-sword/debian/control
index a0a34a244..dd1d46eaa 100644
--- a/debian/_base/applications/tdeio/tdeio-sword/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-sword/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
Standards-Version: 3.7.2
Package: tdeio-sword-trinity
diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control
index d0a6a58ce..e935d1c71 100644
--- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/compat b/debian/_base/applications/themes/gtk-qt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/compat
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/control b/debian/_base/applications/themes/gtk-qt-engine/debian/control
index f6f5d8aa1..4c58e7e09 100644
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/control
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1)
Standards-Version: 3.8.4
Package: gtk-qt-engine-trinity
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/compat b/debian/_base/applications/themes/gtk3-tqt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/compat
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/control b/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
index f8fb914e5..7396b1661 100644
--- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev
Standards-Version: 3.8.4
Package: gtk3-tqt-engine-trinity
diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/compat b/debian/_base/applications/themes/kgtk-qt3/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/kgtk-qt3/debian/compat
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/control b/debian/_base/applications/themes/kgtk-qt3/debian/control
index ecd7e9cac..066d2d949 100644
--- a/debian/_base/applications/themes/kgtk-qt3/debian/control
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/docs b/debian/_base/applications/themes/kgtk-qt3/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..794921e5e 100644
--- a/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
@@ -1,8 +1,2 @@
kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkgtk2.so
kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkqt3.so
-
-kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so
-kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so
-
-kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so
-kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so
diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat b/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/control b/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
index 652e312a4..c0a90f13a 100644
--- a/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, ksplash-trinity
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, ksplash-trinity
Standards-Version: 3.8.4
Package: ksplash-engine-moodin-trinity
diff --git a/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
+++ b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control
index a8384ff60..dcfc6981b 100644
--- a/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control
+++ b/debian/_base/applications/themes/qt4-tqt-theme-engine/debian/control
@@ -2,7 +2,7 @@ Source: qt4-tqt-theme-engine
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: qt4-tqt-theme-engine
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/compat b/debian/_base/applications/themes/tde-style-baghira/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/compat
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/control b/debian/_base/applications/themes/tde-style-baghira/debian/control
index 53546d21d..5001c8667 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/control
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libxtst-dev
Standards-Version: 3.8.0
Package: tde-style-baghira-trinity
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
index 475315ddc..b021de201 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
@@ -1,6 +1,4 @@
tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/libbaghirastarter.so
tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/usermanager_panelapplet.so
-tde-style-baghira-trinity: postinst-must-call-ldconfig opt/trinity/lib/libbaghirastarter.so
-tde-style-baghira-trinity: postrm-should-call-ldconfig opt/trinity/lib/libbaghirastarter.so
tde-style-baghira-trinity: several-sonames-in-same-package usermanager_panelapplet.so libbaghirastarter.so
tde-style-baghira-trinity: package-name-doesnt-match-sonames usermanager-panelapplet libbaghirastarter
diff --git a/debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tde-style-domino/debian/compat b/debian/_base/applications/themes/tde-style-domino/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tde-style-domino/debian/compat
+++ b/debian/_base/applications/themes/tde-style-domino/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tde-style-domino/debian/control b/debian/_base/applications/themes/tde-style-domino/debian/control
index 84e9929b2..fd59eeb97 100644
--- a/debian/_base/applications/themes/tde-style-domino/debian/control
+++ b/debian/_base/applications/themes/tde-style-domino/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
Standards-Version: 3.7.3
Homepage: http://kde-look.org/content/show.php?content=42804
diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/compat b/debian/_base/applications/themes/tde-style-ia-ora/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tde-style-ia-ora/debian/compat
+++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/control b/debian/_base/applications/themes/tde-style-ia-ora/debian/control
index 60390be44..a61fbc7aa 100644
--- a/debian/_base/applications/themes/tde-style-ia-ora/debian/control
+++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
Standards-Version: 3.8.0
Package: tde-style-ia-ora-trinity
diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/compat b/debian/_base/applications/themes/tde-style-lipstik/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tde-style-lipstik/debian/compat
+++ b/debian/_base/applications/themes/tde-style-lipstik/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/control b/debian/_base/applications/themes/tde-style-lipstik/debian/control
index 87f4a8764..74de16a6a 100644
--- a/debian/_base/applications/themes/tde-style-lipstik/debian/control
+++ b/debian/_base/applications/themes/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl b/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/changelog b/debian/_base/applications/themes/tde-style-polyester/debian/changelog
new file mode 100644
index 000000000..fd3fb7e76
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/changelog
@@ -0,0 +1,125 @@
+tde-style-polyester-trinity (1.0.3-2) unstable; urgency=low
+
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 22 Mar 2024 21:04:00 +0900
+
+kde-style-polyester (1.0.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: 442928)
+ * Hardcode the uic usage to use uic-qt3
+ * Bump standards
+ * Move homepage from description to header
+ * Don't ignore errors on make clean
+ * Add some explicit linkage when needed
+ * --as-needed
+
+ -- Sune Vuorela <debian@pusling.com> Sat, 26 Jan 2008 18:14:24 +0100
+
+kde-style-polyester (1.0.1-1) unstable; urgency=low
+
+ [ Sarah Hobbs ]
+ * New Upstream Version.
+ * Added 03_GCC4.3_FTBFS_fix.diff. (Closes: #419799)
+ Thanks to Martin Michlmayr for reporting and for the patch.
+ * Removed 01_autoconf2.6-fixes.diff - fixed upstream.
+
+ [ Sune Vuorela ]
+ * Thanks to Sarah Hobbs for adding the new upstream version.
+
+ -- Sune Vuorela <debian@pusling.com> Fri, 18 May 2007 00:27:53 +0200
+
+kde-style-polyester (1.0-3) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Sune Vuorela <debian@pusling.com> Fri, 13 Apr 2007 23:36:44 +0200
+
+kde-style-polyester (1.0-2) experimental; urgency=low
+
+ * The glib-and-their-way-to-not-respect-$HOME-sucks-bigtime release
+ * Use librsvg2-bin to convert the svg files to .png files instead of
+ inkscape (Closes: #413939)
+ * Run the create-buttons.sh with sh -e to make sure that build fails if the
+ svg to png conversion fails
+ * Use nice quilt (>>0.40) to manage patches
+
+ -- Sune Vuorela <debian@pusling.com> Tue, 20 Mar 2007 09:29:17 +0100
+
+kde-style-polyester (1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Build buttons.h on the fly instead of relying on the upstream buttons.h.
+ the uic command generates apparantly endian-specific code.
+ (Closes: #410373)
+ * Experimental because of etch
+
+ -- Sune Vuorela <debian@pusling.com> Tue, 6 Mar 2007 23:42:32 +0100
+
+kde-style-polyester (1.0~beta1-1) unstable; urgency=low
+
+ * New upstream release
+ * Ack NMU ; thanks Marga and Arjan (Closes: #379812)
+
+ -- Sune Vuorela <debian@pusling.com> Thu, 28 Sep 2006 15:38:46 +0200
+
+kde-style-polyester (0.9.2-1.1) unst able; urgency=low
+
+ * Non-maintainer upload to fix Failure To Build From Source due to the lack
+ of support of autoconf 2.6. Thanks to Arjan Oosting for the patch.
+ (Closes: #379812)
+
+ -- Margarita Manterola <marga@debian.org> Wed, 2 Aug 2006 17:15:23 -0300
+
+kde-style-polyester (0.9.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes copyright file
+ * Taking over after Michael Biebls initial work. Thank you.
+ * Renaming source pacage
+ * Initial upload. Closes: #338635
+
+ -- Sune Vuorela <debian@pusling.com> Sat, 27 May 2006 18:45:00 +0000
+
+polyester (0.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bumped Standards-Version to 3.7.2, no further changes required.
+
+ -- Michael Biebl <biebl@teco.edu> Mon, 10 Apr 2006 03:39:16 +0200
+
+polyester (0.8.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Skipped version 0.8.
+
+ -- Michael Biebl <biebl@teco.edu> Wed, 8 Mar 2006 23:24:38 +0100
+
+polyester (0.7.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bumped debhelper compatibility to 5.
+
+ -- Michael Biebl <biebl@teco.edu> Wed, 22 Feb 2006 15:42:53 +0100
+
+polyester (0.7-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu> Sat, 14 Jan 2006 22:29:58 +0100
+
+polyester (0.6.9-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu> Sun, 8 Jan 2006 18:26:00 +0100
+
+polyester (0.6.5-1) unstable; urgency=low
+
+ * Initial release.
+ * Use Debian libtool and regenerate the autotools files.
+ + Add build dependencies to automake1.9, autoconf and libtool.
+ + Patch makefile_am.diff adds missing libraries needed for linking.
+
+ -- Michael Biebl <biebl@teco.edu> Mon, 19 Dec 2005 11:47:20 +0100
+
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/compat b/debian/_base/applications/themes/tde-style-polyester/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/control b/debian/_base/applications/themes/tde-style-polyester/debian/control
new file mode 100644
index 000000000..1e46cfe80
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/control
@@ -0,0 +1,15 @@
+Source: tde-style-polyester-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev, librsvg2-bin
+Standards-Version: 3.7.3
+
+Package: tde-style-polyester-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Polyester widget style and twin decoration for TDE
+ Widget style and twin decoration both aim to maintain a good balance between
+ eyecandy and simplicity. Widget style is based on Plastik, window decoration
+ is based on Smoothblend.
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/copyright b/debian/_base/applications/themes/tde-style-polyester/debian/copyright
new file mode 100644
index 000000000..e2d3d0919
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized for TDE by:
+ Michele Calgaro <michele.calgaro@yahoo.it> Fri, 22 Mar 2024 18:03:00 +0900.
+
+This package was originally debianized by:
+ Michael Biebl <biebl@teco.edu> on Fri, 11 Nov 2005 17:13:08 +0100.
+
+Original authors:
+ Marco Martin <notmart@gmail.com>
+
+ Window decoration:
+ based on Smootblend by
+ Ryan Nickell <p0z3r@users.sourceforge.net>
+
+ Widget style:
+ based on Plastik by
+ Sandro Giessl <ceebx@users.sourceforge.net>
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/docs b/debian/_base/applications/themes/tde-style-polyester/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/patches/series b/debian/_base/applications/themes/tde-style-polyester/debian/patches/series
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/patches/series
@@ -0,0 +1 @@
+
diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/rules b/debian/_base/applications/themes/tde-style-polyester/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/common/cmake/debian/source/format b/debian/_base/applications/themes/tde-style-polyester/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/common/cmake/debian/source/format
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/source/format
diff --git a/debian/_base/common/cmake/debian/source/options b/debian/_base/applications/themes/tde-style-polyester/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/common/cmake/debian/source/options
+++ b/debian/_base/applications/themes/tde-style-polyester/debian/source/options
diff --git a/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tde-style-qtcurve/debian/compat b/debian/_base/applications/themes/tde-style-qtcurve/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tde-style-qtcurve/debian/compat
+++ b/debian/_base/applications/themes/tde-style-qtcurve/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tde-style-qtcurve/debian/control b/debian/_base/applications/themes/tde-style-qtcurve/debian/control
index 16f7a3b5c..059edf550 100644
--- a/debian/_base/applications/themes/tde-style-qtcurve/debian/control
+++ b/debian/_base/applications/themes/tde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: tde-style-qtcurve-trinity
diff --git a/debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/tdmtheme/debian/compat b/debian/_base/applications/themes/tdmtheme/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/tdmtheme/debian/compat
+++ b/debian/_base/applications/themes/tdmtheme/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/tdmtheme/debian/control b/debian/_base/applications/themes/tdmtheme/debian/control
index e421876c0..157408ff8 100644
--- a/debian/_base/applications/themes/tdmtheme/debian/control
+++ b/debian/_base/applications/themes/tdmtheme/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>,
Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://beta.smileaf.org/projects
diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/compat b/debian/_base/applications/themes/twin-style-crystal/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/twin-style-crystal/debian/compat
+++ b/debian/_base/applications/themes/twin-style-crystal/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/control b/debian/_base/applications/themes/twin-style-crystal/debian/control
index c8d870e02..56c3d0f3c 100644
--- a/debian/_base/applications/themes/twin-style-crystal/debian/control
+++ b/debian/_base/applications/themes/twin-style-crystal/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
Standards-Version: 3.8.4
Package: twin-style-crystal-trinity
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/compat b/debian/_base/applications/themes/twin-style-dekorator/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/twin-style-dekorator/debian/compat
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/control b/debian/_base/applications/themes/twin-style-dekorator/debian/control
index 4625fc1f0..f075cb563 100644
--- a/debian/_base/applications/themes/twin-style-dekorator/debian/control
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev
Standards-Version: 3.7.2
Package: twin-style-dekorator-trinity
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/changelog b/debian/_base/applications/themes/twin-style-fahrenheit/debian/changelog
new file mode 100644
index 000000000..7b0f84239
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/changelog
@@ -0,0 +1,5 @@
+twin-style-fahrenheit-trinity (0.1-0) unstable; urgency=low
+
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 17 Oct 2023 20:48:00 +0900
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/compat b/debian/_base/applications/themes/twin-style-fahrenheit/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/control b/debian/_base/applications/themes/twin-style-fahrenheit/debian/control
new file mode 100644
index 000000000..9be6b38e1
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/control
@@ -0,0 +1,12 @@
+Source: twin-style-fahrenheit-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-fahrenheit-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration
+ This is a port of the KDE 3.2's version of Fahrenheit window decoration
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/copyright b/debian/_base/applications/themes/twin-style-fahrenheit/debian/copyright
new file mode 100644
index 000000000..7ba2bdbcc
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/copyright
@@ -0,0 +1,8 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Tue, 17 Oct 2023 20:48:00 +0900
+
+It was downloaded from https://www.trinity-look.org/p/1100374
+
+Original authors:
+ Peter Clark <theclarks@mail.ru>
+ David Johnson <david@usermode.org>
diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules b/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/dependencies/python-tqt/debian/source/format b/debian/_base/applications/themes/twin-style-fahrenheit/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/dependencies/python-tqt/debian/source/format
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/source/format
diff --git a/debian/_base/dependencies/python-tqt/debian/source/options b/debian/_base/applications/themes/twin-style-fahrenheit/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/dependencies/python-tqt/debian/source/options
+++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/source/options
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/changelog b/debian/_base/applications/themes/twin-style-machbunt/debian/changelog
new file mode 100644
index 000000000..b58d7112d
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/changelog
@@ -0,0 +1,6 @@
+twin-style-machbunt-trinity (0.1-1) unstable; urgency=low
+
+ * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com> Sun, 16 Oct 2022 11:07:15 +0900
+
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/compat b/debian/_base/applications/themes/twin-style-machbunt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/control b/debian/_base/applications/themes/twin-style-machbunt/debian/control
new file mode 100644
index 000000000..59237598a
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/control
@@ -0,0 +1,15 @@
+Source: twin-style-machbunt-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Adrian Schroeter <adrian@suse.de>, Gerd Fleischer <gerdfleischer@web.de>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-machbunt-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration from SUSE 9.1/9.2
+ This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+ .
+ An example color scheme is provided too.
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/copyright b/debian/_base/applications/themes/twin-style-machbunt/debian/copyright
new file mode 100644
index 000000000..dfd1f265b
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/copyright
@@ -0,0 +1,31 @@
+This code was ported to TDE by:
+ Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+ Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+ Adrian Schroeter <adrian@suse.de>
+ Gerd Fleischer <gerdfleischer@web.de>
+
+On Debian systems, the complete text of the GNU Library General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+For the rest of the package this license applies:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02111-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/_base/libraries/libksquirrel/debian/patches/.gitignore b/debian/_base/applications/themes/twin-style-machbunt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/libraries/libksquirrel/debian/patches/.gitignore
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/patches/series
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/rules b/debian/_base/applications/themes/twin-style-machbunt/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/libraries/python-trinity/debian/source/format b/debian/_base/applications/themes/twin-style-machbunt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/libraries/python-trinity/debian/source/format
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/source/format
diff --git a/debian/_base/libraries/python-trinity/debian/source/options b/debian/_base/applications/themes/twin-style-machbunt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/libraries/python-trinity/debian/source/options
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/source/options
diff --git a/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/themes/twin-style-suse2/debian/compat b/debian/_base/applications/themes/twin-style-suse2/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/themes/twin-style-suse2/debian/compat
+++ b/debian/_base/applications/themes/twin-style-suse2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/themes/twin-style-suse2/debian/control b/debian/_base/applications/themes/twin-style-suse2/debian/control
index 52c1269a5..dcb0af17d 100644
--- a/debian/_base/applications/themes/twin-style-suse2/debian/control
+++ b/debian/_base/applications/themes/twin-style-suse2/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Adrian Neumaier <adrian@firehand.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
Standards-Version: 3.6.2
Package: twin-style-suse2-trinity
diff --git a/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/abakus/debian/compat b/debian/_base/applications/utilities/abakus/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/abakus/debian/compat
+++ b/debian/_base/applications/utilities/abakus/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/abakus/debian/control b/debian/_base/applications/utilities/abakus/debian/control
index fbf1bbcc9..823ed395f 100644
--- a/debian/_base/applications/utilities/abakus/debian/control
+++ b/debian/_base/applications/utilities/abakus/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex
Standards-Version: 3.8.4
Package: abakus-trinity
diff --git a/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/filelight/debian/compat b/debian/_base/applications/utilities/filelight/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/filelight/debian/compat
+++ b/debian/_base/applications/utilities/filelight/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/filelight/debian/control b/debian/_base/applications/utilities/filelight/debian/control
index 2a1d19aa6..c1b4491f8 100644
--- a/debian/_base/applications/utilities/filelight/debian/control
+++ b/debian/_base/applications/utilities/filelight/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xutils
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, xutils
Homepage: http://www.methylblue.com/filelight/
Package: filelight-trinity
diff --git a/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/kbarcode/debian/compat b/debian/_base/applications/utilities/kbarcode/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/kbarcode/debian/compat
+++ b/debian/_base/applications/utilities/kbarcode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/kbarcode/debian/control b/debian/_base/applications/utilities/kbarcode/debian/control
index a7eaab954..c2d2fe2b9 100644
--- a/debian/_base/applications/utilities/kbarcode/debian/control
+++ b/debian/_base/applications/utilities/kbarcode/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kbarcode-trinity
diff --git a/debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/kchmviewer/debian/compat b/debian/_base/applications/utilities/kchmviewer/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/kchmviewer/debian/compat
+++ b/debian/_base/applications/utilities/kchmviewer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/kchmviewer/debian/control b/debian/_base/applications/utilities/kchmviewer/debian/control
index 995adbee1..8f5ba9018 100644
--- a/debian/_base/applications/utilities/kchmviewer/debian/control
+++ b/debian/_base/applications/utilities/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libchm-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libchm-dev
Standards-Version: 3.8.4
Homepage: http://www.kchmviewer.net/
diff --git a/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/kcpuload/debian/compat b/debian/_base/applications/utilities/kcpuload/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/kcpuload/debian/compat
+++ b/debian/_base/applications/utilities/kcpuload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/kcpuload/debian/control b/debian/_base/applications/utilities/kcpuload/debian/control
index 426e1ea5d..88f98f018 100644
--- a/debian/_base/applications/utilities/kcpuload/debian/control
+++ b/debian/_base/applications/utilities/kcpuload/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kcpuload-trinity
diff --git a/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/kdirstat/debian/compat b/debian/_base/applications/utilities/kdirstat/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/kdirstat/debian/compat
+++ b/debian/_base/applications/utilities/kdirstat/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/kdirstat/debian/control b/debian/_base/applications/utilities/kdirstat/debian/control
index 412ceec96..c0f6ef898 100644
--- a/debian/_base/applications/utilities/kdirstat/debian/control
+++ b/debian/_base/applications/utilities/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
Section: misc
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kdirstat.sourceforge.net/
diff --git a/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/keep/debian/compat b/debian/_base/applications/utilities/keep/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/keep/debian/compat
+++ b/debian/_base/applications/utilities/keep/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/keep/debian/control b/debian/_base/applications/utilities/keep/debian/control
index cce7e2a99..1877002bd 100644
--- a/debian/_base/applications/utilities/keep/debian/control
+++ b/debian/_base/applications/utilities/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/knutclient/debian/compat b/debian/_base/applications/utilities/knutclient/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/knutclient/debian/compat
+++ b/debian/_base/applications/utilities/knutclient/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/knutclient/debian/control b/debian/_base/applications/utilities/knutclient/debian/control
index 3a601c672..91182e136 100644
--- a/debian/_base/applications/utilities/knutclient/debian/control
+++ b/debian/_base/applications/utilities/knutclient/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org>
Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Homepage: http://www.knut.noveradsl.cz/knutclient/
Package: knutclient-trinity
diff --git a/debian/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/utilities/kommando/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kommando/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/utilities/kommando/debian/changelog b/debian/_base/applications/utilities/kommando/debian/changelog
new file mode 100644
index 000000000..6259ef8bc
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/changelog
@@ -0,0 +1,67 @@
+kommando-trinity (0.5.2-0) unstable; urgency=low
+
+ * Trinity version
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sun, 23 Jul 2023 11:50:46 +0900
+
+kommando (0.5.1-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Sune Vuorela <debian@pusling.com> Fri, 13 Apr 2007 23:49:21 +0200
+
+kommando (0.5.1-1) experimental; urgency=low
+
+ * New upstream release.
+ - Removing kommandorc from root of tarball.
+ * Removing patch to move conffile. Integrated upstream.
+ * kommando is now a kded module, not a stand alone program.
+ - menu file removed.
+ - man page removed.
+ - NEWS.Debian added.
+
+ -- Sune Vuorela <debian@pusling.com> Thu, 28 Dec 2006 16:47:01 +0100
+
+kommando (0.4.1-2) unstable; urgency=low
+
+ * Fixed problems with moving of kommandorc
+
+ -- Sune Vuorela <debian@pusling.com> Sun, 29 Jan 2006 19:54:32 +0100
+
+kommando (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com> Fri, 27 Jan 2006 22:26:33 +0000
+
+kommando (0.4.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com> Wed, 25 Jan 2006 22:06:50 +0000
+
+kommando (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com> Sat, 19 Nov 2005 22:35:44 +0000
+
+kommando (0.2-2) unstable; urgency=low
+
+ * Passes lintian
+ * First debian release Closes: #336607
+
+ -- Sune Vuorela <debian@pusling.com> Tue, 1 Nov 2005 13:00:00 +0100
+
+kommando (0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com> Sun, 2 Oct 2005 21:51:18 +0000
+
+kommando (0.1.2-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Sune Vuorela <debian@pusling.com> Tue, 27 Sep 2005 21:37:53 +0000
+
diff --git a/debian/_base/applications/utilities/kommando/debian/compat b/debian/_base/applications/utilities/kommando/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/applications/utilities/kommando/debian/control b/debian/_base/applications/utilities/kommando/debian/control
new file mode 100644
index 000000000..e29e23d86
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/control
@@ -0,0 +1,15 @@
+Source: kommando-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxmu-dev
+Standards-Version: 3.8.4
+
+Package: kommando-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a TDE wheel-menu to quickly pick menu items with the mouse
+ It allows rapid access to user defined applications and shell
+ commands and is of course a nice piece of eyecandy to improve the
+ look and usability of TDE.
diff --git a/debian/_base/applications/utilities/kommando/debian/copyright b/debian/_base/applications/utilities/kommando/debian/copyright
new file mode 100644
index 000000000..be9aabb0b
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/copyright
@@ -0,0 +1,39 @@
+This code was ported to TDE and packaged for Debian by:
+ Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+ https://snapshot.debian.org/package/kommando/0.5.1-/
+and from the KDE store:
+ https://store.kde.org/p/1081202/
+All original code was released under GPL2 license.
+
+Original code was packaged for Debian by:
+ Sune Vuorela <debian@pusling.com> on
+Tue, 27 Sep 2005 21:37:53 +0000.
+
+It was downloaded from http://www.kde-look.org/content/show.php?content=29514
+
+Copyright Holder (C) 2005,2006: Daniel Stoeckel <the_docter (at) gmx.net>
+
+License:
+
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2005-2007, Sune Vuorela <debian@pusling.com> and
+is licensed under the GPL, see above.
+
diff --git a/debian/_base/applications/utilities/kommando/debian/docs b/debian/_base/applications/utilities/kommando/debian/docs
new file mode 100644
index 000000000..6f83607c1
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/_base/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/applications/utilities/kommando/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/applications/utilities/kommando/debian/patches/series
diff --git a/debian/_base/applications/utilities/kommando/debian/rules b/debian/_base/applications/utilities/kommando/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/utilities/kommando/debian/source/format b/debian/_base/applications/utilities/kommando/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/applications/utilities/kommando/debian/source/options b/debian/_base/applications/utilities/kommando/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/applications/utilities/kommando/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/kompose/debian/compat b/debian/_base/applications/utilities/kompose/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/kompose/debian/compat
+++ b/debian/_base/applications/utilities/kompose/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/kompose/debian/control b/debian/_base/applications/utilities/kompose/debian/control
index 86be6e3a1..a808f8827 100644
--- a/debian/_base/applications/utilities/kompose/debian/control
+++ b/debian/_base/applications/utilities/kompose/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev
Standards-Version: 3.8.4
Package: kompose-trinity
diff --git a/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/krename/debian/compat b/debian/_base/applications/utilities/krename/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/krename/debian/compat
+++ b/debian/_base/applications/utilities/krename/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/krename/debian/control b/debian/_base/applications/utilities/krename/debian/control
index 7c6ea9297..a1a17df3f 100644
--- a/debian/_base/applications/utilities/krename/debian/control
+++ b/debian/_base/applications/utilities/krename/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Richard A. Johnson <nixternal@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
Standards-Version: 3.8.4
Package: krename-trinity
diff --git a/debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/ksensors/debian/compat b/debian/_base/applications/utilities/ksensors/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/ksensors/debian/compat
+++ b/debian/_base/applications/utilities/ksensors/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/ksensors/debian/control b/debian/_base/applications/utilities/ksensors/debian/control
index 8212563ba..497a3b570 100644
--- a/debian/_base/applications/utilities/ksensors/debian/control
+++ b/debian/_base/applications/utilities/ksensors/debian/control
@@ -2,7 +2,7 @@ Source: ksensors-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsensors-dev | libsensors4-dev, tdelibs14-trinity-dev, imagemagick
Build-Conflicts: autoconf2.13
Standards-Version: 3.8.3
diff --git a/debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/mathemagics/debian/compat b/debian/_base/applications/utilities/mathemagics/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/mathemagics/debian/compat
+++ b/debian/_base/applications/utilities/mathemagics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/mathemagics/debian/control b/debian/_base/applications/utilities/mathemagics/debian/control
index 84de6a15a..3128539a1 100644
--- a/debian/_base/applications/utilities/mathemagics/debian/control
+++ b/debian/_base/applications/utilities/mathemagics/debian/control
@@ -2,7 +2,7 @@ Source: mathemagics-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: mathemagics-trinity
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/compat b/debian/_base/applications/utilities/qalculate-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/utilities/qalculate-tde/debian/compat
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/control b/debian/_base/applications/utilities/qalculate-tde/debian/control
index dc6bfaba3..4cce4bb33 100644
--- a/debian/_base/applications/utilities/qalculate-tde/debian/control
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/control
@@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
X-Original-Maintainer: Vincent Legout <vincent@legout.info>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
Standards-Version: 3.8.4
Homepage: http://qalculate.sourceforge.net/
diff --git a/debian/_base/common/cmake/debian/cdbs/debian-tde.mk b/debian/_base/common/cmake/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/debian/_base/common/cmake/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
- cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
- touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
- cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
- else
- cdbs_kde_enable_final =
- endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- cdbs_kde_enable_final =
- cdbs_kde_enable_debug = --enable-debug=yes
-else
- cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
- cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
- --with-qt-dir=/usr/share/qt3 \
- --disable-rpath \
- --with-xinerama \
- $(cdbs_kde_enable_final) \
- $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
- $(MAKE) -f admin/Makefile.common dist
-endif
- debian/rules clean
-
-.tdepkginfo:
- echo "# TDE package information" >.tdepkginfo
- dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
- dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
- date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
- if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
- for f in $$(find debian/man -name '*.sgml'); do \
- docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
- done
- for f in $$(find debian/man -name '*.man'); do \
- soelim -I debian/man $$f \
- > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
- done
- touch debian/stamp-man-pages
-
-common-binary-indep::
- ( set -e; \
- tmpf=`mktemp debian/versions.XXXXXX`; \
- perl debian/cdbs/versions.pl >$$tmpf; \
- for p in $(DEB_INDEP_PACKAGES); do \
- cat $$tmpf >>debian/$$p.substvars; \
- done; \
- rm -f $$tmpf )
-
-common-binary-arch::
- ( set -e; \
- tmpf=`mktemp debian/versions.XXXXXX`; \
- perl debian/cdbs/versions.pl >$$tmpf; \
- for p in $(DEB_ARCH_PACKAGES); do \
- cat $$tmpf >>debian/$$p.substvars; \
- done; \
- rm -f $$tmpf )
- # update multi-arch path in install files
- ls -d debian/* | \
- grep -E "(install|links)$$" | \
- while read a; do \
- [ -d $$a ] || [ -f $$a.arch ] || \
- ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
- sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
- done
-
-clean::
- rm -rf debian/man/out
- -rmdir debian/man
- rm -f debian/stamp-man-pages
- rm -rf debian/shlibs-check
- # revert multi-arch path in install files
- ls -d debian/* | \
- grep -E "(install|links)$$" | \
- while read a; do \
- [ ! -f $$a.arch ] || \
- mv $$a.arch $$a; \
- done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
- if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
- if test -e debian/$(cdbs_curpkg).lintian; then \
- install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
- fi
- if test -e debian/$(cdbs_curpkg).presubj; then \
- install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
- fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
- set -e; \
- for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
- pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
- echo Building $$pkg HTML docs...; \
- mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
- cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
- /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
- done
- for pkg in $(DOC_HTML_PRUNE) ; do \
- rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
- done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
- touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
- $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
- -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
- if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
- cd $(DEB_SRCDIR); \
- find . -name Makefile.in -print | \
- xargs --no-run-if-empty rm -f; \
- rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
- configure configure.files configure.in stamp-h.in \
- subdirs; \
- fi
-endif
- rm -f .tdepkginfo
- rm -f debian/stamp-kde-apidox
- rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/_base/common/cmake/debian/changelog b/debian/_base/common/cmake/debian/changelog
deleted file mode 100644
index a5303f852..000000000
--- a/debian/_base/common/cmake/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low
-
- * Initial release as a standalone package.
-
- -- Slávek Banko <slavek.banko@axis.cz> Fri, 14 May 2021 12:50:36 +0200
diff --git a/debian/_base/common/cmake/debian/compat b/debian/_base/common/cmake/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/common/cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/common/cmake/debian/control b/debian/_base/common/cmake/debian/control
deleted file mode 100644
index 50ea830ef..000000000
--- a/debian/_base/common/cmake/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: cmake-trinity
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
-Standards-Version: 3.8.4
-
-Package: cmake-trinity
-Architecture: all
-Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl
-Description: TDE CMake modules
- TDE uses its own set of modules and macros to simplify CMake rules.
- .
- This also includes the TDEL10n module that is used to generate and
- update templates for translations and the modified version of
- intltool-merge used to merge translations into desktop files.
diff --git a/debian/_base/core/tde-i18n/debian/compat b/debian/_base/core/tde-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tde-i18n/debian/compat
+++ b/debian/_base/core/tde-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tde-i18n/debian/control b/debian/_base/core/tde-i18n/debian/control
index f5b6bb982..33461f159 100644
--- a/debian/_base/core/tde-i18n/debian/control
+++ b/debian/_base/core/tde-i18n/debian/control
@@ -2,7 +2,7 @@ Source: tde-i18n-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.4
Package: tde-i18n-trinity
@@ -10,7 +10,7 @@ Architecture: all
Section: tde
Replaces: kde-i18n-trinity (<< 4:14.0.0~)
Breaks: kde-i18n-trinity (<< 4:14.0.0~)
-Depends: tdelibs14-trinity
+Depends: tdelibs-trinity
Suggests: tde-trinity
Provides: tde-i18n-trinity
Description: All languages (all) internationalized (i18n) files for TDE
diff --git a/debian/_base/core/tde-i18n/debian/control-lang b/debian/_base/core/tde-i18n/debian/control-lang
index 5d409c28d..2fce8baf8 100644
--- a/debian/_base/core/tde-i18n/debian/control-lang
+++ b/debian/_base/core/tde-i18n/debian/control-lang
@@ -4,7 +4,7 @@ Architecture: all
Section: tde
Replaces: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~)
Breaks: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~)
-Depends: tdelibs14-trinity
+Depends: tdelibs-trinity
Suggests: tde-trinity
Provides: tde-i18n-trinity
Description: @lang_desc@ (@lang@) internationalized (i18n) files for TDE
diff --git a/debian/_base/core/tde-i18n/debian/control-source b/debian/_base/core/tde-i18n/debian/control-source
index 984fed2a5..b959dad00 100644
--- a/debian/_base/core/tde-i18n/debian/control-source
+++ b/debian/_base/core/tde-i18n/debian/control-source
@@ -2,5 +2,5 @@ Source: tde-i18n-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev
Standards-Version: 3.8.4
diff --git a/debian/_base/core/tde-i18n/debian/rules b/debian/_base/core/tde-i18n/debian/rules
index 0daf98a6d..900b2d86e 100755
--- a/debian/_base/core/tde-i18n/debian/rules
+++ b/debian/_base/core/tde-i18n/debian/rules
@@ -150,6 +150,7 @@ binary-indep: build install
dh_installdocs
dh_installmenu
dh_installchangelogs
+ dh_link
dh_strip
$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
dh_strip_nondeterminism)
diff --git a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeaccessibility/debian/compat b/debian/_base/core/tdeaccessibility/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeaccessibility/debian/compat
+++ b/debian/_base/core/tdeaccessibility/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeaccessibility/debian/control b/debian/_base/core/tdeaccessibility/debian/control
index a0c2c8b06..d26d03169 100644
--- a/debian/_base/core/tdeaccessibility/debian/control
+++ b/debian/_base/core/tdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
Standards-Version: 3.8.4
Package: tdeaccessibility-trinity
diff --git a/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeaddons/debian/compat b/debian/_base/core/tdeaddons/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeaddons/debian/compat
+++ b/debian/_base/core/tdeaddons/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeaddons/debian/control b/debian/_base/core/tdeaddons/debian/control
index 9a10fb5ae..dcde30b0b 100644
--- a/debian/_base/core/tdeaddons/debian/control
+++ b/debian/_base/core/tdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb++-dev | libdb5.3++-dev | libdb4.8++-dev, libogg-dev, dh-python
Standards-Version: 3.8.4
Package: tdeaddons-trinity
@@ -152,7 +152,7 @@ Architecture: all
Section: tde
Replaces: knewsticker-scripts-trinity (<< 4:14.0.0~)
Breaks: knewsticker-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
+Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
Recommends: knewsticker-trinity
Enhances: knewsticker-trinity
Description: scripts for KNewsTicker, the Trinity news ticker
@@ -171,7 +171,7 @@ Architecture: any
Section: tde
Replaces: konq-plugins-trinity (<< 4:14.0.0~)
Breaks: konq-plugins-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison
+Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison
Recommends: akregator-trinity, ark-trinity, imagemagick
Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
Enhances: konqueror-trinity, akregator-trinity
diff --git a/debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian
deleted file mode 100644
index 705d74139..000000000
--- a/debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# Call is inserted by debhelper and is correct.
-kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
-kicker-applets-trinity: postrm-has-useless-call-to-ldconfig
diff --git a/debian/_base/core/tdeaddons/debian/rules b/debian/_base/core/tdeaddons/debian/rules
index 7cd88847d..9dca91731 100755
--- a/debian/_base/core/tdeaddons/debian/rules
+++ b/debian/_base/core/tdeaddons/debian/rules
@@ -31,11 +31,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
binary-install/tdeaddons-tdefile-plugins-trinity::
install -p -D -m644 renamedlgplugins/README \
- debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
binary-install/knewsticker-scripts-trinity::
- chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
- chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.py
+ chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.pl
+ chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.py
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/knewsticker/scripts
binary-install/kate-plugins-trinity::
- chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh
+ chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kate/scripts/html-tidy.sh
+
+binary-install/konq-plugins-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/imagerotation
diff --git a/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeadmin/debian/compat b/debian/_base/core/tdeadmin/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeadmin/debian/compat
+++ b/debian/_base/core/tdeadmin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeadmin/debian/control b/debian/_base/core/tdeadmin/debian/control
index 5afe64648..4110e6154 100644
--- a/debian/_base/core/tdeadmin/debian/control
+++ b/debian/_base/core/tdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man
Standards-Version: 3.8.4
Package: tdeadmin-trinity
diff --git a/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeartwork/debian/compat b/debian/_base/core/tdeartwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeartwork/debian/compat
+++ b/debian/_base/core/tdeartwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeartwork/debian/control b/debian/_base/core/tdeartwork/debian/control
index 0647acdfb..728dad921 100644
--- a/debian/_base/core/tdeartwork/debian/control
+++ b/debian/_base/core/tdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
Build-Conflicts: nvidia-glx
Standards-Version: 3.8.4
diff --git a/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdebase/debian/compat b/debian/_base/core/tdebase/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdebase/debian/compat
+++ b/debian/_base/core/tdebase/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control
index 07ca7b9cf..6f2808d73 100644
--- a/debian/_base/core/tdebase/debian/control
+++ b/debian/_base/core/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
@@ -324,6 +324,7 @@ Architecture: any
Replaces: kicker-trinity (<< 4:14.0.0~)
Breaks: kicker-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~)
+Recommends: desktop-file-utils
Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~)
Description: desktop panel for TDE
diff --git a/debian/_base/core/tdebase/debian/kdesktop-trinity.postinst b/debian/_base/core/tdebase/debian/kdesktop-trinity.postinst
deleted file mode 100644
index 0b3eb0b52..000000000
--- a/debian/_base/core/tdebase/debian/kdesktop-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kdesktop-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/khelpcenter-trinity.install b/debian/_base/core/tdebase/debian/khelpcenter-trinity.install
index 96fce70e1..4e883cb6b 100644
--- a/debian/_base/core/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/_base/core/tdebase/debian/khelpcenter-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/man9.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/mann.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/support.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/quickstart.desktop
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/releasenotes.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/visualdict.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/userguide.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/welcome.desktop
@@ -99,6 +100,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docboo
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
diff --git a/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian
index 3a278bff7..c57f28095 100644
--- a/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1 @@
khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst
deleted file mode 100644
index b6b0656b7..000000000
--- a/debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for khelpcenter-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/klipper-trinity.lintian b/debian/_base/core/tdebase/debian/klipper-trinity.lintian
index bee8b8020..c46e478c8 100644
--- a/debian/_base/core/tdebase/debian/klipper-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1 @@
klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/debian/_base/core/tdebase/debian/klipper-trinity.postinst b/debian/_base/core/tdebase/debian/klipper-trinity.postinst
deleted file mode 100644
index b2c57de01..000000000
--- a/debian/_base/core/tdebase/debian/klipper-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for klipper-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian
index c36dd0445..f9d56b353 100644
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,2 @@
kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
-kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
-kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst
deleted file mode 100644
index b3a79cc14..000000000
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kmenuedit-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.docs b/debian/_base/core/tdebase/debian/konqueror-trinity.docs
index c023d564b..e00f630aa 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.docs
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.lintian b/debian/_base/core/tdebase/debian/konsole-trinity.lintian
index 7006dfe10..f0a12e1aa 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1 @@
konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.postinst b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
index 532e028bd..9191bdc69 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -21,9 +21,6 @@ case "$1" in
configure)
update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
--slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1
-
- # force ldconfig due to tdeinit library
- ldconfig
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -42,5 +39,3 @@ esac
#DEBHELPER#
exit 0
-
-
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian b/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian
index 2c7c61596..74b77ecf6 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1 @@
ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
-ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 14e203a41..48d90e182 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -23,9 +23,6 @@ case "$1" in
x-session-manager /opt/trinity/bin/starttde 40 \
--slave /usr/share/man/man1/x-session-manager.1 \
x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1"
-
- # force ldconfig due to tdeinit library
- ldconfig
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -44,5 +41,3 @@ esac
#DEBHELPER#
exit 0
-
-
diff --git a/debian/_base/core/tdebase/debian/libkonq4-trinity.docs b/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
index c023d564b..e00f630aa 100644
--- a/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
+++ b/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules
index ebcb8a186..e86e0401a 100755
--- a/debian/_base/core/tdebase/debian/rules
+++ b/debian/_base/core/tdebase/debian/rules
@@ -45,6 +45,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
-DWITH_LDAP="ON" \
-DWITH_SAMBA="ON" \
+ -DWITH_SFTP="ON" \
-DWITH_LIBUSB="ON" \
-DWITH_LIBRAW1394="ON" \
-DWITH_OPENEXR="ON" \
@@ -74,6 +75,9 @@ DEB_FIXPERMS_EXCLUDE := \
DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
+DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade
+
DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
index ffd4cc04a..0ab9bc8a8 100644
--- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -88,20 +88,26 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc
+debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc
debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc
diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
index c8666a793..9ddb66bc2 100644
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -1,6 +1,8 @@
debian/tmp/opt/trinity/bin/migratekde3
debian/tmp/opt/trinity/bin/r14-xdg-update
debian/tmp/opt/trinity/bin/tde_release_notes
+debian/tmp/opt/trinity/bin/tde_license_info
+debian/tmp/opt/trinity/bin/tde_show_license_info
debian/tmp/opt/trinity/bin/krootbacking
debian/tmp/opt/trinity/bin/tdeinit_phase1
debian/tmp/opt/trinity/bin/tdeinit_displayconfig
@@ -75,7 +77,9 @@ debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
+debian/tmp/opt/trinity/share/apps/kxkb/eventsrc
debian/tmp/opt/trinity/share/autostart/tde_release_notes.desktop
+debian/tmp/opt/trinity/share/autostart/tde_license_info.desktop
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
index 6501cf36b..ddaa5b274 100644
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
@@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root
tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
-tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
-tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian b/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian
index 52cd10d88..8410a13ae 100644
--- a/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian
+++ b/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,2 @@
tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
-tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
-tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/debian/_base/core/tdebase/debian/tdeprint-trinity.postinst b/debian/_base/core/tdebase/debian/tdeprint-trinity.postinst
deleted file mode 100644
index c812a9390..000000000
--- a/debian/_base/core/tdebase/debian/tdeprint-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdeprint-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.postrm b/debian/_base/core/tdebase/debian/tdm-trinity.postrm
index f20297bab..478413e3d 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.postrm
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.postrm
@@ -38,9 +38,6 @@ if [ "$1" = "purge" ] ; then
update-rc.d tdm remove >/dev/null || true
fi
fi
-if [ -d /run/systemd/system ] ; then
- systemctl --system daemon-reload >/dev/null || true
-fi
#DEBHELPER#
diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.prerm b/debian/_base/core/tdebase/debian/tdm-trinity.prerm
index eeecadfc5..34604ee00 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.prerm
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.prerm
@@ -178,4 +178,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
fi
fi
+#DEBHELPER#
+
exit 0
diff --git a/debian/_base/core/tdebase/debian/twin-trinity.install b/debian/_base/core/tdebase/debian/twin-trinity.install
index 381a173be..52c59c4a7 100644
--- a/debian/_base/core/tdebase/debian/twin-trinity.install
+++ b/debian/_base/core/tdebase/debian/twin-trinity.install
@@ -11,24 +11,24 @@ debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la
debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so
debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la
debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so
-debian/tmp/opt/trinity/lib/trinity/twin3_b2.la
-debian/tmp/opt/trinity/lib/trinity/twin3_b2.so
-debian/tmp/opt/trinity/lib/trinity/twin3_default.la
-debian/tmp/opt/trinity/lib/trinity/twin3_default.so
-debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la
-debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so
-debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la
-debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so
-debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la
-debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so
-debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la
-debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so
-debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la
-debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so
-debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la
-debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so
-debian/tmp/opt/trinity/lib/trinity/twin3_web.la
-debian/tmp/opt/trinity/lib/trinity/twin3_web.so
+debian/tmp/opt/trinity/lib/trinity/twin_b2.la
+debian/tmp/opt/trinity/lib/trinity/twin_b2.so
+debian/tmp/opt/trinity/lib/trinity/twin_default.la
+debian/tmp/opt/trinity/lib/trinity/twin_default.so
+debian/tmp/opt/trinity/lib/trinity/twin_keramik.la
+debian/tmp/opt/trinity/lib/trinity/twin_keramik.so
+debian/tmp/opt/trinity/lib/trinity/twin_laptop.la
+debian/tmp/opt/trinity/lib/trinity/twin_laptop.so
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys.la
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys.so
+debian/tmp/opt/trinity/lib/trinity/twin_plastik.la
+debian/tmp/opt/trinity/lib/trinity/twin_plastik.so
+debian/tmp/opt/trinity/lib/trinity/twin_quartz.la
+debian/tmp/opt/trinity/lib/trinity/twin_quartz.so
+debian/tmp/opt/trinity/lib/trinity/twin_redmond.la
+debian/tmp/opt/trinity/lib/trinity/twin_redmond.so
+debian/tmp/opt/trinity/lib/trinity/twin_web.la
+debian/tmp/opt/trinity/lib/trinity/twin_web.so
debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la
debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so
debian/tmp/opt/trinity/lib/trinity/twin_default_config.la
@@ -54,12 +54,11 @@ debian/tmp/opt/trinity/share/applications/tde/twindecoration.desktop
debian/tmp/opt/trinity/share/applications/tde/twinoptions.desktop
debian/tmp/opt/trinity/share/applications/tde/twinrules.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinactiveborders.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop
-debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl
-debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd
debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh
debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd
debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh
diff --git a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdebindings/debian/compat b/debian/_base/core/tdebindings/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdebindings/debian/compat
+++ b/debian/_base/core/tdebindings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdebindings/debian/control b/debian/_base/core/tdebindings/debian/control
index f56288575..6c3719503 100644
--- a/debian/_base/core/tdebindings/debian/control
+++ b/debian/_base/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
Source: tdebindings-trinity
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 10~),
+ python3-all-dev, dh-python, quilt, gawk,
default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
- tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs14-trinity-dev,
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
Section: devel
Priority: optional
@@ -16,7 +16,7 @@ Architecture: all
Section: tde
Replaces: kdebindings-trinity (<< 4:14.0.0~)
Breaks: kdebindings-trinity (<< 4:14.0.0~)
-Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
+Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
Description: TDE bindings metapackage
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -65,7 +65,7 @@ Description: DCOP bindings for Java [Trinity]
This package is part of the official TDE bindings module.
Package: libdcop3-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
Section: libs
Replaces: libdcop3-jni-trinity (<< 4:14.0.0~)
Breaks: libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -79,7 +79,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
This package is part of the official TDE bindings module.
Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
Section: libdevel
Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~)
Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -110,7 +110,7 @@ Description: Java bindings for Qt [Trinity]
This package is part of the official TDE bindings module.
Package: libqt3-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
Section: libs
Replaces: libqt3-jni-trinity (<< 4:14.0.0~)
Breaks: libqt3-jni-trinity (<< 4:14.0.0~)
@@ -139,7 +139,7 @@ Description: tdelibs bindings for Java [Trinity]
This package is part of the official TDE bindings module.
Package: libtrinity-jni-trinity
-Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc
+Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc
Section: libs
Replaces: libtrinity-jni-trinity (<< 4:14.0.0~)
Breaks: libtrinity-jni-trinity (<< 4:14.0.0~)
@@ -211,13 +211,11 @@ Description: SMOKE Binding Library to TDE - Development Files
.
This package is part of the official TDE bindings module.
-Package: python-dcop-trinity
+Package: python3-dcop-trinity
Architecture: any
Section: python
-Replaces: python-dcop-trinity (<< 4:14.0.0~)
-Breaks: python-dcop-trinity (<< 4:14.0.0~)
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
Description: DCOP bindings for Python
This package contains the shared libraries necessary to run and
develop Python programs using the Python DCOP bindings
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.install b/debian/_base/core/tdebindings/debian/python-dcop-trinity.install
deleted file mode 100644
index 364b52d9d..000000000
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/python2.*/site-packages
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.docs b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.docs
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.examples b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.examples
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples
diff --git a/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install
new file mode 100644
index 000000000..8123736e6
--- /dev/null
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/lib/python3/dist-packages
diff --git a/debian/_base/core/tdebindings/debian/rules b/debian/_base/core/tdebindings/debian/rules
index 63b19e54f..f7d6f4790 100755
--- a/debian/_base/core/tdebindings/debian/rules
+++ b/debian/_base/core/tdebindings/debian/rules
@@ -3,10 +3,6 @@
DEB_QUILT_PATCHDIR_LINK :=
export QUILT_PATCHES=debian/patches
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
include /usr/share/cdbs/1/rules/debhelper.mk
override DEB_BUILDDIR := $(DEB_SRCDIR)
include debian/cdbs/debian-tde.mk
@@ -33,7 +29,7 @@ endif
DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \
DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python'
-DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk
+DEB_COMPRESS_EXCLUDE_ALL += .java .ui .js .rb .map .wav .bmp .cpp .sk
# These are not all the packages with libraries, but only those that
# need to be in DEB_SHLIBDEPS_INCLUDE...
@@ -111,8 +107,9 @@ common-install-arch:: stamp-install-dcopjava
binary-install/juic-trinity::
sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
-binary-install/python-dcop-trinity::
- ${DH_PYTHON2} -p$(cdbs_curpkg)
+
+binary-install/python3-dcop-trinity::
+ dh_python3 -p$(cdbs_curpkg)
###
diff --git a/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeedu/debian/compat b/debian/_base/core/tdeedu/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeedu/debian/compat
+++ b/debian/_base/core/tdeedu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeedu/debian/control b/debian/_base/core/tdeedu/debian/control
index e58c28ea5..c6c89f5d1 100644
--- a/debian/_base/core/tdeedu/debian/control
+++ b/debian/_base/core/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript
Standards-Version: 3.8.4
Package: tdeedu-trinity
diff --git a/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdegames/debian/compat b/debian/_base/core/tdegames/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdegames/debian/compat
+++ b/debian/_base/core/tdegames/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdegames/debian/control b/debian/_base/core/tdegames/debian/control
index 8c1caf9e6..ec8e4df81 100644
--- a/debian/_base/core/tdegames/debian/control
+++ b/debian/_base/core/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdegraphics/debian/compat b/debian/_base/core/tdegraphics/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdegraphics/debian/compat
+++ b/debian/_base/core/tdegraphics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdegraphics/debian/control b/debian/_base/core/tdegraphics/debian/control
index 0994da2c8..8ca5c8d94 100644
--- a/debian/_base/core/tdegraphics/debian/control
+++ b/debian/_base/core/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut-dev | freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev
Standards-Version: 3.8.4
Package: tdegraphics-trinity
diff --git a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..dbcda26a3 100644
--- a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
@@ -1,4 +1,2 @@
kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so
-kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so
-kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so
kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage
diff --git a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
index 89f453cea..121ed9a1b 100644
--- a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,2 @@
kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdelibs/debian/compat b/debian/_base/core/tdelibs/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdelibs/debian/compat
+++ b/debian/_base/core/tdelibs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control
index d3a5a8293..fdb2810b6 100644
--- a/debian/_base/core/tdelibs/debian/control
+++ b/debian/_base/core/tdelibs/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils,
binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man,
libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -28,7 +28,7 @@ Architecture: all
Replaces: kdelibs-trinity (<< 4:14.0.0~)
Breaks: kdelibs-trinity (<< 4:14.0.0~)
Provides: tdelibs
-Depends: tdelibs14-trinity (>= ${source:Version}),
+Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}),
tdelibs-data-trinity (>= ${source:Version})
Description: core libraries from the official Trinity release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules
index 8292b5f73..40c8003b2 100755
--- a/debian/_base/core/tdelibs/debian/rules
+++ b/debian/_base/core/tdelibs/debian/rules
@@ -11,9 +11,16 @@ export LD_LIBRARY_PATH
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/debian-tde.mk
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
+
DEB_KDE_APIDOX := yes
version=Debian Package $(DEB_VERSION)
@@ -106,3 +113,40 @@ binary-install/tdelibs14-trinity::
mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/tdelibs14-trinity\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \
+ -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/tdelibs14$(DEB_TIME64_SUFFIX)-trinity\." | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index d06f09083..615399188 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1748,6 +1748,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V3
debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3
debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
+debian/tmp/opt/trinity/share/apps/LICENSES/MIT
debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
debian/tmp/opt/trinity/share/apps/tdemarkdown
debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
index f2a8d925b..99078621c 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
+++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
case "$1" in
upgrade|install)
- ldconfig
;;
abort-upgrade)
diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
index aae9f3600..40c135b0c 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
+++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
case "$1" in
remove)
- ldconfig
;;
abort-upgrade)
diff --git a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdemultimedia/debian/compat b/debian/_base/core/tdemultimedia/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdemultimedia/debian/compat
+++ b/debian/_base/core/tdemultimedia/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdemultimedia/debian/control b/debian/_base/core/tdemultimedia/debian/control
index 7e9169dbb..b568d8f1c 100644
--- a/debian/_base/core/tdemultimedia/debian/control
+++ b/debian/_base/core/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
Standards-Version: 3.8.4
Package: tdemultimedia-trinity
diff --git a/debian/_base/core/tdemultimedia/debian/kmix-trinity.install b/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
index 3e0d2daf7..4ee39eb84 100644
--- a/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
@@ -12,29 +12,10 @@ debian/tmp/opt/trinity/share/applications/tde/kmix.desktop
debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
debian/tmp/opt/trinity/share/apps/kmix/pics/Listener.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_error.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_mute.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ac97.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_audio.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_bass.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_cd.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_digital.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ext.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_headphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_microphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_midi.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_recmon.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_record.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_surround.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_treble.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/Speaker*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/mix*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/crystal/*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/oldcrystal/*.png
debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop
debian/tmp/opt/trinity/share/autostart/kmix.desktop
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common
diff --git a/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian
index c802a5b07..914623090 100644
--- a/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,2 @@
kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian b/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian
index 9cba1f36a..e5e13fb57 100644
--- a/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1 @@
krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdenetwork/debian/compat b/debian/_base/core/tdenetwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdenetwork/debian/compat
+++ b/debian/_base/core/tdenetwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdenetwork/debian/control b/debian/_base/core/tdenetwork/debian/control
index a19b6119c..62c3a1c25 100644
--- a/debian/_base/core/tdenetwork/debian/control
+++ b/debian/_base/core/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst b/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst
deleted file mode 100644
index 5076ff321..000000000
--- a/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kdict-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian b/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian
index f219b1176..6cd864e57 100644
--- a/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1 @@
ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst b/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst
deleted file mode 100644
index 1ee118baa..000000000
--- a/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for ksirc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..f85b1021c 100644
--- a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1 @@
kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
diff --git a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk b/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdepim/debian/compat b/debian/_base/core/tdepim/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdepim/debian/compat
+++ b/debian/_base/core/tdepim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdepim/debian/control b/debian/_base/core/tdepim/debian/control
index 70058651b..aa5705508 100644
--- a/debian/_base/core/tdepim/debian/control
+++ b/debian/_base/core/tdepim/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
tdelibs14-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libogg-dev,
libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~),
@@ -21,7 +21,7 @@ Section: tde
Architecture: all
Replaces: kdepim-trinity (<< 4:14.0.0~)
Breaks: kdepim-trinity (<< 4:14.0.0~)
-Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version})
+Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}) | libkleopatra1t64-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) | libmimelib1t64-trinity (>= ${source:Version})
Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
diff --git a/debian/_base/core/tdepim/debian/rules b/debian/_base/core/tdepim/debian/rules
index f2de846ca..874cc57ac 100755
--- a/debian/_base/core/tdepim/debian/rules
+++ b/debian/_base/core/tdepim/debian/rules
@@ -13,6 +13,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
DEB_KDE_APIDOX := yes
DEB_CMAKE_EXTRA_FLAGS := \
@@ -86,3 +93,54 @@ KDE_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\.dfsg.
KDE_TARBALL := ../$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION).tar.bz2
KDE_SOURCEDIR := dfsg-tmp/$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION)
NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libmimelib1c2a" | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libmimelib1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \
+ done
+ ls -d debian/* | \
+ grep -E "/libkleopatra1-" | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libkleopatra1$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+ -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ \
+ -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+ -e "s/\\(libkleopatra1\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/libmimelib1$(DEB_TIME64_SUFFIX)-" | \
+ xargs -r rm
+ ls -d debian/* | \
+ grep -E "/libkleopatra1$(DEB_TIME64_SUFFIX)-" | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian b/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian
index 6759ea297..189c5f2f2 100644
--- a/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian
@@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/
# This is from tdeinit black magic.
cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst b/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst
deleted file mode 100644
index 800a596bf..000000000
--- a/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for cervisia-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdesdk/debian/compat b/debian/_base/core/tdesdk/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdesdk/debian/compat
+++ b/debian/_base/core/tdesdk/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdesdk/debian/control b/debian/_base/core/tdesdk/debian/control
index 2a80b21bd..fff07d391 100644
--- a/debian/_base/core/tdesdk/debian/control
+++ b/debian/_base/core/tdesdk/debian/control
@@ -4,11 +4,11 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39),
tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
libktnef1-trinity-dev, libsvn-dev, libdb-dev,
- libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
+ libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), dh-python
Standards-Version: 3.8.4
Package: tdesdk-trinity
@@ -165,7 +165,7 @@ Architecture: all
Section: devel
Replaces: kcachegrind-converters-trinity (<< 4:14.0.0~)
Breaks: kcachegrind-converters-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, php-cli | php5-cli, python-all
+Depends: ${perl:Depends}, ${python3:Depends}, php-cli | php5-cli
Recommends: tdecachegrind-trinity
Description: format converters for TDECachegrind profiling visualisation tool
This is a collection of scripts for converting the output from
@@ -219,7 +219,7 @@ Architecture: all
Section: devel
Replaces: kdesdk-scripts-trinity (<< 4:14.0.0~)
Breaks: kdesdk-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python-all
+Depends: ${perl:Depends}, ${python3:Depends}
Recommends: automake1.9 | automaken, cvs, gawk
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts
Enhances: kate-trinity
@@ -360,7 +360,7 @@ Architecture: any
Section: devel
Replaces: umbrello-trinity (<< 4:14.0.0~)
Breaks: umbrello-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
Description: UML modelling tool and code generator
Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
diff --git a/debian/_base/core/tdesdk/debian/rules b/debian/_base/core/tdesdk/debian/rules
index 2a1a0c921..a550a3c23 100755
--- a/debian/_base/core/tdesdk/debian/rules
+++ b/debian/_base/core/tdesdk/debian/rules
@@ -32,28 +32,35 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
binary-install/tdesdk-scripts-trinity::
- mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
- debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
- mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
- debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
+ mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean \
+ debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean-kde
+ mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svnversions \
+ debian/$(cdbs_curpkg)/opt/trinity/bin/svnversion-kde
install -p -D -m644 scripts/kde-buildrc \
- debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
binary-install/tdesdk-misc-trinity::
install -p -D -m644 kdeaccounts-plugin/README \
- debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
install -p -D -m644 tdeioslave/svn/AUTHORS \
- debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn
install -p -D -m644 tdeioslave/svn/README \
- debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn
install -p -D -m644 kprofilemethod/README \
- debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
install -p -D -m644 scheck/README \
- debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck
+ debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.scheck
binary-install/kapptemplate-trinity::
- rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
+ rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \
Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
- chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
+ chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
done
+
+binary-install/tdecachegrind-converters-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
+
+binary-install/umbrello-trinity::
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/umbrello/headings
diff --git a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdetoys/debian/compat b/debian/_base/core/tdetoys/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdetoys/debian/compat
+++ b/debian/_base/core/tdetoys/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdetoys/debian/control b/debian/_base/core/tdetoys/debian/control
index f8fc79be5..cdc77d77b 100644
--- a/debian/_base/core/tdetoys/debian/control
+++ b/debian/_base/core/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
Standards-Version: 3.8.4
Package: tdetoys-trinity
diff --git a/debian/_base/core/tdetoys/debian/kweather-trinity.postinst b/debian/_base/core/tdetoys/debian/kweather-trinity.postinst
deleted file mode 100644
index 99a084399..000000000
--- a/debian/_base/core/tdetoys/debian/kweather-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kweather-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..66bb7fec8 100644
--- a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1 @@
ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/_base/core/tdeutils/debian/ark-trinity.postinst b/debian/_base/core/tdeutils/debian/ark-trinity.postinst
deleted file mode 100644
index b919d035f..000000000
--- a/debian/_base/core/tdeutils/debian/ark-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for ark-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdeutils/debian/compat b/debian/_base/core/tdeutils/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdeutils/debian/compat
+++ b/debian/_base/core/tdeutils/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdeutils/debian/control b/debian/_base/core/tdeutils/debian/control
index 75e872254..bcbda8bba 100644
--- a/debian/_base/core/tdeutils/debian/control
+++ b/debian/_base/core/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev | python-all-dev, libxtst-dev, xutils
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..3c468628f 100644
--- a/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1 @@
kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst b/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst
deleted file mode 100644
index 6cf1c841c..000000000
--- a/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kcalc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.lintian b/debian/_base/core/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fbe5924d2 100644
--- a/debian/_base/core/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/_base/core/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1 @@
kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.postinst b/debian/_base/core/tdeutils/debian/kedit-trinity.postinst
deleted file mode 100644
index 1fa143a43..000000000
--- a/debian/_base/core/tdeutils/debian/kedit-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kedit-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdeutils/debian/rules b/debian/_base/core/tdeutils/debian/rules
index 6014293b3..1eb1c2497 100755
--- a/debian/_base/core/tdeutils/debian/rules
+++ b/debian/_base/core/tdeutils/debian/rules
@@ -33,9 +33,3 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini
DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg
PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-binary-install/superkaramba-trinity::
- rm -f debian/superkaramba/opt/trinity/share/doc/superkaramba/examples/globalMouse/xcursor.so
diff --git a/debian/_base/core/tdeutils/debian/superkaramba-trinity.examples b/debian/_base/core/tdeutils/debian/superkaramba-trinity.examples
deleted file mode 100644
index c02a032d2..000000000
--- a/debian/_base/core/tdeutils/debian/superkaramba-trinity.examples
+++ /dev/null
@@ -1,12 +0,0 @@
-superkaramba/examples/API
-superkaramba/examples/autoHide
-superkaramba/examples/globalMouse
-superkaramba/examples/input_api
-superkaramba/examples/input_example
-superkaramba/examples/mouseDrag
-superkaramba/examples/popupMenu
-superkaramba/examples/README
-superkaramba/examples/richtext
-superkaramba/examples/taskBar
-superkaramba/examples/template.py
-superkaramba/examples/unicode
diff --git a/debian/_base/core/tdeutils/debian/superkaramba-trinity.install b/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
index b56555797..6304c3c0e 100644
--- a/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
+++ b/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
@@ -1,6 +1,7 @@
debian/tmp/opt/trinity/bin/superkaramba
debian/tmp/opt/trinity/share/applications/tde/superkaramba.desktop
debian/tmp/opt/trinity/share/apps/superkaramba/superkarambaui.rc
+debian/tmp/opt/trinity/share/apps/superkaramba/examples
debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.docbook
diff --git a/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..666092455 100644
--- a/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian
+++ b/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian
@@ -1,3 +1 @@
tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst
deleted file mode 100644
index 9119d5017..000000000
--- a/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdelirc-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdevelop/debian/compat b/debian/_base/core/tdevelop/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdevelop/debian/compat
+++ b/debian/_base/core/tdevelop/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdevelop/debian/control b/debian/_base/core/tdevelop/debian/control
index 0986f66c0..5b3756cc2 100644
--- a/debian/_base/core/tdevelop/debian/control
+++ b/debian/_base/core/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
Replaces: kdevelop-trinity (<< 4:14.0.0~)
Breaks: kdevelop-trinity (<< 4:14.0.0~)
Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake-trinity, ruby, python-all, g++, kdevdesigner-trinity
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity
Description: An IDE for Unix/X11
TDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features
diff --git a/debian/_base/core/tdevelop/debian/watch b/debian/_base/core/tdevelop/debian/watch
deleted file mode 100644
index 18344a41a..000000000
--- a/debian/_base/core/tdevelop/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2
diff --git a/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/core/tdewebdev/debian/compat b/debian/_base/core/tdewebdev/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/core/tdewebdev/debian/compat
+++ b/debian/_base/core/tdewebdev/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/core/tdewebdev/debian/control b/debian/_base/core/tdewebdev/debian/control
index b052c381e..abd9cd044 100644
--- a/debian/_base/core/tdewebdev/debian/control
+++ b/debian/_base/core/tdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/akode/debian/compat b/debian/_base/dependencies/akode/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/akode/debian/compat
+++ b/debian/_base/dependencies/akode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control
index cbfa4bb85..07f1b7913 100644
--- a/debian/_base/dependencies/akode/debian/control
+++ b/debian/_base/dependencies/akode/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
Standards-Version: 3.7.3
Package: libakode2
diff --git a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/arts/debian/compat b/debian/_base/dependencies/arts/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/arts/debian/compat
+++ b/debian/_base/dependencies/arts/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/arts/debian/control b/debian/_base/dependencies/arts/debian/control
index 83192d6a3..7f1841236 100644
--- a/debian/_base/dependencies/arts/debian/control
+++ b/debian/_base/dependencies/arts/debian/control
@@ -4,7 +4,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
Priority: optional
Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
docbook-to-man, texinfo,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev,
@@ -18,7 +18,7 @@ Architecture: all
Section: sound
Replaces: arts-trinity (<< 4:14.0.0~)
Breaks: arts-trinity (<< 4:14.0.0~)
-Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version})
+Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) | libarts1t64-trinity (>= ${source:Version})
Description: sound system from the official TDE release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
diff --git a/debian/_base/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules
index cc4893ca9..a934b8c5a 100755
--- a/debian/_base/dependencies/arts/debian/rules
+++ b/debian/_base/dependencies/arts/debian/rules
@@ -12,6 +12,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = t64
+else
+DEB_TIME64_SUFFIX = c2a
+endif
+
+
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" \
@@ -30,13 +38,13 @@ DEB_CMAKE_EXTRA_FLAGS := \
DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg
-PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity
+PACKAGES_WITH_LIBS := libarts1$(DEB_TIME64_SUFFIX)-trinity libartsc0-trinity
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib)
-DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity := -V'libarts1c2a-trinity (>= 1.5.9)'
-DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1$(DEB_TIME64_SUFFIX)-trinity := -V'libarts1$(DEB_TIME64_SUFFIX)-trinity (>= 1.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)'
#shlibs_ver = 1.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
@@ -47,3 +55,40 @@ binary-predeb/libarts1-trinity-dev::
ifeq (linux,$(DEB_HOST_ARCH_OS))
echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars
endif
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libarts1c2a" | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libarts1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \
+ -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/libarts1$(DEB_TIME64_SUFFIX)-" | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/avahi-tqt/debian/compat b/debian/_base/dependencies/avahi-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/avahi-tqt/debian/compat
+++ b/debian/_base/dependencies/avahi-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/avahi-tqt/debian/control b/debian/_base/dependencies/avahi-tqt/debian/control
index 171d4678e..a21507b87 100644
--- a/debian/_base/dependencies/avahi-tqt/debian/control
+++ b/debian/_base/dependencies/avahi-tqt/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
- cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt,
+ tde-cmake, ninja-build,
gcc,
pkg-config,
libtqtinterface-dev,
diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/compat b/debian/_base/dependencies/dbus-1-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/dbus-1-tqt/debian/compat
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/control b/debian/_base/dependencies/dbus-1-tqt/debian/control
index 451be956d..20064441f 100644
--- a/debian/_base/dependencies/dbus-1-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
Section: devel
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.8.3
diff --git a/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/dbus-tqt/debian/compat b/debian/_base/dependencies/dbus-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/dbus-tqt/debian/compat
+++ b/debian/_base/dependencies/dbus-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/dbus-tqt/debian/control b/debian/_base/dependencies/dbus-tqt/debian/control
index 68eab2d63..d16fa5d28 100644
--- a/debian/_base/dependencies/dbus-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
Standards-Version: 3.8.3
Package: libdbus-tqt-1-1c2
diff --git a/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/libart-lgpl/debian/compat b/debian/_base/dependencies/libart-lgpl/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/libart-lgpl/debian/compat
+++ b/debian/_base/dependencies/libart-lgpl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/libart-lgpl/debian/control b/debian/_base/dependencies/libart-lgpl/debian/control
index 85484ca75..7dde9f931 100644
--- a/debian/_base/dependencies/libart-lgpl/debian/control
+++ b/debian/_base/dependencies/libart-lgpl/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
Standards-Version: 3.8.4
Package: libart-2.0-2
diff --git a/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/libcaldav/debian/compat b/debian/_base/dependencies/libcaldav/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/libcaldav/debian/compat
+++ b/debian/_base/dependencies/libcaldav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/libcaldav/debian/control b/debian/_base/dependencies/libcaldav/debian/control
index 6cdf8e7aa..35bc4055d 100644
--- a/debian/_base/dependencies/libcaldav/debian/control
+++ b/debian/_base/dependencies/libcaldav/debian/control
@@ -2,7 +2,7 @@ Source: libcaldav
Section: graphics
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev
Standards-Version: 3.8.3
Package: libcaldav
diff --git a/debian/_base/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules
index e898aa6d2..9b371a62d 100755
--- a/debian/_base/dependencies/libcaldav/debian/rules
+++ b/debian/_base/dependencies/libcaldav/debian/rules
@@ -4,6 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = 0t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
+
ifdef DEB_HOST_MULTIARCH
CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
else
@@ -18,3 +26,39 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
-DWITH_ALL_OPTIONS="ON" \
-DBUILD_ALL="ON"
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libcaldav\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libcaldav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+ -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/libcarddav/debian/compat b/debian/_base/dependencies/libcarddav/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/libcarddav/debian/compat
+++ b/debian/_base/dependencies/libcarddav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/libcarddav/debian/control b/debian/_base/dependencies/libcarddav/debian/control
index cb394a2c6..1f8eee3bb 100644
--- a/debian/_base/dependencies/libcarddav/debian/control
+++ b/debian/_base/dependencies/libcarddav/debian/control
@@ -2,7 +2,7 @@ Source: libcarddav
Section: graphics
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev
Standards-Version: 3.8.4
Package: libcarddav
diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules
index e898aa6d2..22b8c9e32 100755
--- a/debian/_base/dependencies/libcarddav/debian/rules
+++ b/debian/_base/dependencies/libcarddav/debian/rules
@@ -4,6 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = 0t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
+
ifdef DEB_HOST_MULTIARCH
CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
else
@@ -18,3 +26,39 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
-DWITH_ALL_OPTIONS="ON" \
-DBUILD_ALL="ON"
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libcarddav\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libcarddav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \
+ -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+ debian/control
+endif
+
+clean::
+ dh_testdir
+ dh_clean
+
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/libr/debian/compat b/debian/_base/dependencies/libr/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/libr/debian/compat
+++ b/debian/_base/dependencies/libr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/libr/debian/control b/debian/_base/dependencies/libr/debian/control
index 121049451..df44ba5b5 100644
--- a/debian/_base/dependencies/libr/debian/control
+++ b/debian/_base/dependencies/libr/debian/control
@@ -1,12 +1,12 @@
Source: libr
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libglade2-dev, binutils-dev, doxygen
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libgtk2.0-dev, binutils-dev, doxygen
Standards-Version: 3.8.4
Section: libs
Homepage: http://www.compholio.com/elficon/
-Package: libr0
+Package: libr1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -16,6 +16,6 @@ Description: ELF binary resource library
Package: libr-dev
Section: libdevel
Architecture: any
-Depends: libr0 (= ${binary:Version})
+Depends: libr1 (= ${binary:Version})
Description: ELF binary resource library
Store and retrieve resources from ELF binaries.
diff --git a/debian/_base/dependencies/libr/debian/libr0.dirs b/debian/_base/dependencies/libr/debian/libr1.dirs
index 68457717b..68457717b 100644
--- a/debian/_base/dependencies/libr/debian/libr0.dirs
+++ b/debian/_base/dependencies/libr/debian/libr1.dirs
diff --git a/debian/_base/dependencies/libr/debian/libr0.install b/debian/_base/dependencies/libr/debian/libr1.install
index d0dbfd18a..d0dbfd18a 100644
--- a/debian/_base/dependencies/libr/debian/libr0.install
+++ b/debian/_base/dependencies/libr/debian/libr1.install
diff --git a/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/polkit-tqt/debian/compat b/debian/_base/dependencies/polkit-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/polkit-tqt/debian/compat
+++ b/debian/_base/dependencies/polkit-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/polkit-tqt/debian/control b/debian/_base/dependencies/polkit-tqt/debian/control
index 7da8dc684..27e070a69 100644
--- a/debian/_base/dependencies/polkit-tqt/debian/control
+++ b/debian/_base/dependencies/polkit-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev,
libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
Standards-Version: 3.9.2
diff --git a/debian/_base/dependencies/python-tqt/debian/README.Debian b/debian/_base/dependencies/python-tqt/debian/README.Debian
deleted file mode 100644
index 33603ec40..000000000
--- a/debian/_base/dependencies/python-tqt/debian/README.Debian
+++ /dev/null
@@ -1,4 +0,0 @@
-DOCUMENTATION
--------------
-You can find doc and examples about PyTQt in the package python-tqt-doc
-
diff --git a/debian/_base/dependencies/python-tqt/debian/changelog b/debian/_base/dependencies/python-tqt/debian/changelog
deleted file mode 100644
index 95e2f0cce..000000000
--- a/debian/_base/dependencies/python-tqt/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-python-tqt (3.18.1-4ubuntu0) lucid; urgency=low
-
- * Initial build
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Nov 2011 01:16:00 -0600
-
diff --git a/debian/_base/dependencies/python-tqt/debian/compat b/debian/_base/dependencies/python-tqt/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/dependencies/python-tqt/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/dependencies/python-tqt/debian/control b/debian/_base/dependencies/python-tqt/debian/control
deleted file mode 100644
index 577566cd9..000000000
--- a/debian/_base/dependencies/python-tqt/debian/control
+++ /dev/null
@@ -1,200 +0,0 @@
-Source: python-tqt
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python
-Standards-Version: 3.8.4
-XS-Python-Version: >= 2.3
-X-Python3-Version: >= 3.0
-
-Package: python-tqt
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
-Replaces: python-tqt (<< 4:14.0.0~)
-Breaks: python-tqt (<< 4:14.0.0~)
-Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python:Provides}
-Description: TQt bindings for Python
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- At this moment PyTQt offers a vast subset of TQt API. There are
- some minor issues related to the differences between C++ and Python
- (types, etc), but usually you'll be able to write code pretty much the
- same way in both languages (with syntax differences, of course)
-
-Package: python-tqt-dbg
-Architecture: any
-Priority: extra
-Replaces: python-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python (debug extension)
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python3-tqt
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends}
-Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python3:Provides}
-Description: TQt bindings for Python 3
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- At this moment PyTQt offers a vast subset of TQt API. There are
- some minor issues related to the differences between C++ and Python
- (types, etc), but usually you'll be able to write code pretty much the
- same way in both languages (with syntax differences, of course)
-
-Package: python3-tqt-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python 3 (debug extension)
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqt-gl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
-Replaces: python-tqt-gl (<< 4:14.0.0~)
-Breaks: python-tqt-gl (<< 4:14.0.0~)
-Suggests: python-tqt-doc
-Provides: ${python:Provides}
-Description: TQt OpenGL bindings for Python
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
-
-Package: python-tqt-gl-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python (debug extension)
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python3-tqt-gl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
-Suggests: python-tqt-doc
-Provides: ${python3:Provides}
-Description: TQt OpenGL bindings for Python 3
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
-
-Package: python3-tqt-gl-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python 3 (debug extension)
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqtext
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
-Replaces: python-tqtext (<< 4:14.0.0~)
-Breaks: python-tqtext (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Description: TQt extensions for PyTQt
- PyTQt Extensions. Contains:
- .
- * QScintilla: a featureful TQt source code editing component based
- on Scintilla.
-
-Package: python-tqtext-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqtext-dbg (<< 4:14.0.0~)
-Breaks: python-tqtext-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt debug extensions for PyTQt
- PyTQt debug Extensions. Contains:
- .
- * QScintilla: a featureful TQt source code editing component based
- on Scintilla.
-
-Package: python3-tqtext
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
-Provides: ${python3:Provides}
-Description: TQt extensions for PyTQt
- PyTQt Extensions. Contains:
- .
- * QScintilla: a featureful TQt source code editing component based
- on Scintilla.
-
-Package: python3-tqtext-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt debug extensions for PyTQt
- PyTQt debug Extensions. Contains:
- .
- * QScintilla: a featureful TQt source code editing component based
- on Scintilla.
-
-Package: pytqt-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: pytqt-tools (<< 4:14.0.0~)
-Breaks: pytqt-tools (<< 4:14.0.0~)
-Description: pyuic and pylupdate for TQt
- pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
- user interface file and generates Python code.
- .
- pylupdate is the counterpart for TQt's lupdate. It updates TQt
- Linguist translation files from Python code.
-
-Package: python-tqt-dev
-Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
-Replaces: python-tqt-dev (<< 4:14.0.0~)
-Breaks: python-tqt-dev (<< 4:14.0.0~)
-Architecture: all
-Description: TQt bindings for Python - Development files
- Development .sip files with definitions of PyTQt classes. They
- are needed to build PyTQt, but also as building blocks of other
- packages based on them, like PyTDE.
-
-Package: python-tqt-doc
-Section: doc
-Architecture: all
-Replaces: python-tqt-doc (<< 4:14.0.0~)
-Breaks: python-tqt-doc (<< 4:14.0.0~)
-Depends: ${misc:Depends}
-Suggests: python-tqt
-Description: TQt bindings for Python - Documentation and examples
- Documentation and examples for the PyTQt (bindings that allow
- the use of TQt library from within a Python script).
diff --git a/debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 b/debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
deleted file mode 100644
index 4d2c8919a..000000000
--- a/debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
-.\"
-.\" Copyright 2001 Trolltech AS. All rights reserved.
-.\" Copyright 2004 Ricardo Cardenes. All rights reserved.
-.\"
-.\" This file may be distributed and/or modified under the terms of the
-.\" GNU General Public License version 2 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.GPL included in the
-.\" packaging of this file.
-.\"
-.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\" See http://www.trolltech.com/gpl/ for GPL licensing information.
-.\"
-.SH NAME
-pylupdate \- update Qt Linguist translation files from Python sources
-.SH SYNOPSIS
-.B pylupdate
-.RI "[ " options " ] " project-file...
-.SH DESCRIPTION
-This page documents the
-.B Qt Linguist Update
-tool for the Qt GUI toolkit, for Python source files.
-.B PyLupdate
-reads a qmake project file (.pro file), finds the translatable
-strings in the specified source, header and interface files, and
-updates the translation files (.ts files) specified in it. The
-translation files are given to the translator who uses
-.B Qt Linguist
-to read the files and insert the translations.
-.PP
-The .ts file format is a simple human-readable XML format that can be
-used with version control systems if required.
-.PP
-.SH OPTIONS
-.TP
-.I "-help"
-Display the usage and exit.
-.TP
-.I "-noobsolete"
-Drop all obsolete strings.
-.TP
-.I "-verbose"
-Explain what is being done.
-.TP
-.I "-version"
-Display the version of
-.B pylupdate
-and exit.
-.SH USAGE
-Here is an example .pro file that can be given to
-.B pylupdate:
-.PP
-.in +4
-.nf
-SOURCES = funnydialog.py \\
- main.py \\
- wackywidget.py
-FORMS = fancybox.ui
-TRANSLATIONS = gnomovision_dk.ts \\
- gnomovision_fi.ts \\
- gnomovision_no.ts \\
- gnomovision_se.ts
-.fi
-.in -4
-.PP
-When running
-.B pylupdate
-on this project file, the translatable strings in all the files
-listed in the SOURCES and FORMS entries will be put in
-the translation files listed in the TRANSLATIONS entry. Previous
-translations will be reused as far as possible, and translated
-strings that have vanished from the source files are marked obsolete.
-.SH "SEE ALSO"
-.BR lupdate (1),
-.BR lrelease (1)
-and
-.BR http://doc.trolltech.com/i18n.html
-.SH AUTHOR
-This manual page was written by Ricardo J. Cárdenes Medina
-for the Debian GNU/Linux System (but may be used by others), based
-on Trolltech's <info@trolltech.com> manual page for lupdate
diff --git a/debian/_base/dependencies/python-tqt/debian/manpages/pyuic.1 b/debian/_base/dependencies/python-tqt/debian/manpages/pyuic.1
deleted file mode 100644
index f1ffa41ff..000000000
--- a/debian/_base/dependencies/python-tqt/debian/manpages/pyuic.1
+++ /dev/null
@@ -1,74 +0,0 @@
-.TH pyuic 1 "25 June 2001" \" -*- nroff -*-
-.SH NAME
-pyuic \- Qt user interface compiler for Python
-.SH SYNOPSIS
-.B pyuic
-[options] <uifile>
-.SH DESCRIPTION
-This page documents the
-.B Python User Interface Compiler
-for the Qt GUI application framework. The
-.B pyuic
-reads a user interface definition file (.ui) in XML as generated by Qt
-Designer and creates corresponding Python module.
-.PP
-.PP
-Generate implementation:
-.br
-.I "\fB pyuic [options] \fI<uifile>"
-.br
-.PP
-Generate image collection:
-.br
-.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
-.br
- \fI<project>\fP: project name
- \fI<image[1..n]>\fP: image files
-.br
-.PP
-Generate subclass implementation:
-.br
-.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>"
-.br
- \fI<classname>\fP: name of the subclass to generate
-.PP
-
-.SH GENERAL OPTIONS
-.TP
-.I "-o file"
-Write output to
-.I file
-rather than to stdout.
-.TP
-.I "-p indent"
-Set the Python
-.I indent
-in spaces (0 to use a tab)
-.TP
-.I "-tr func"
-Use
-.I func(...)
-rather than tr(...) for i18n.
-.TP
-.I -x
-Generate extra code to test the class
-.TP
-.I -test
-Generate extra code to test but not display the class
-.TP
-.I -version
-Display version of pyuic
-.TP
-.I -help
-Display this information
-
-.SH "SEE ALSO"
-.BR uic (1)
-
-.BR http://www.trolltech.com/
-
-.BR http://www.riverbankcomputing.co.uk/
-.SH AUTHOR
-This manual page was written by Ricardo J. Cárdenes Medina
-for the Debian GNU/Linux System (but may be used by others), based
-on Trolltech's <info@trolltech.com> manual page for uic
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
deleted file mode 100644
index bd57734b2..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ /dev/null
@@ -1,14 +0,0 @@
-# lintian test overriden as the files tripping this error are put into the source
-# of the generated package. This is a false-positive
-
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
deleted file mode 100644
index 43a4fa9fa..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/python-tqt-doc/html
-usr/share/doc/python-tqt-doc/examples
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install
deleted file mode 100644
index 65f82036b..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
deleted file mode 100644
index d58e26ab5..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt.install b/debian/_base/dependencies/python-tqt/debian/python-tqt.install
deleted file mode 100644
index 4ec8f4d19..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python2.*/*-packages/python_tqt/qtsql.so
-usr/lib/python2.*/*-packages/python_tqt/qttable.so
-usr/lib/python2.*/*-packages/python_tqt/qtui.so
-usr/lib/python2.*/*-packages/python_tqt/qtxml.so
-usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
deleted file mode 100644
index 00345e2e7..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
deleted file mode 100644
index ead3920cf..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt.install b/debian/_base/dependencies/python-tqt/debian/python3-tqt.install
deleted file mode 100644
index 4ceda8c75..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python3-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python3*/*-packages/python_tqt/qtsql.so
-usr/lib/python3*/*-packages/python_tqt/qttable.so
-usr/lib/python3*/*-packages/python_tqt/qtui.so
-usr/lib/python3*/*-packages/python_tqt/qtxml.so
-usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install
deleted file mode 100644
index 4d58d8a28..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages b/debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
deleted file mode 100644
index 7d27d0034..000000000
--- a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/pylupdate.1
-debian/manpages/pyuic.1
diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules
deleted file mode 100755
index a4d57e493..000000000
--- a/debian/_base/dependencies/python-tqt/debian/rules
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-export DH_OPTIONS
-
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-py_sitename = site-packages
-py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-py_sitename_sh = $(py_sitename)
-py_libdir_sh = $(py_libdir)
-endif
-
-
-DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
-INSTDIR=$(CURDIR)/debian
-
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O1
-endif
-CXXFLAGS += "-I/usr/include/tqt"
-
-PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-DEB_PARALLEL_JOBS ?= 40
-
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-
-configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-
-build-%/configure-stamp:
- dh_testdir
- mkdir -p build-$*
- cd build-$* && echo yes \
- | python$* ../configure.py \
- -c -n /usr/include/tqt3 \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
- -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
- -l /usr/include/python$* \
- -v /usr/share/sip-tqt/tqt \
- -m /usr/lib/python$*/config \
- -z \
- CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
- touch $@
-
-dbg-build-%/configure-stamp:
- dh_testdir
- mkdir -p dbg-build-$*
- cd dbg-build-$* && echo yes \
- | python$*-dbg ../configure.py \
- -c -n /usr/include/tqt3 \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
- -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
- -l /usr/include/python$*_d \
- -v /usr/share/sip-tqt/tqt \
- -m /usr/lib/python$*/config_d \
- -z \
- CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
- touch $@
-
-build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
-build-indep:
-
-build-%/build-stamp: build-%/configure-stamp
- dh_testdir
- $(MAKE) -C build-$*
- touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
- dh_testdir
- $(MAKE) -C dbg-build-$*
- touch $@
-
-install-indep: configure
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- for version in ${PYTHONS}; do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
- mkdir -p debian/python-tqt-dev/$$pylib;\
- install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
- done
- dh_install -i
-
-install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -k -a
- dh_installdirs -a
-
- for p in $(PYTHONS) ; do \
- $(MAKE) -f debian/rules install-arch-$$p;\
- done
-
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
- for i in $$(find debian/python-*-dbg -name '*.so'); do \
- b=$$(basename $$i .so); \
- mv $$i $$(dirname $$i)/$${b}_d.so; \
- done
- find debian/python-*-dbg ! -type d \
- ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
- find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-
- for i in $$(find debian/python3-*-dbg -name '*.so'); do \
- b=$$(basename $$i .so); \
- mv $$i $$(dirname $$i)/$${b}_d.so; \
- done
- find debian/python3-*-dbg ! -type d \
- ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
- find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
-
-install-arch-3.%:
- $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
- mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
- cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
- debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
- mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
- mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
- debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
- mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
- mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
- debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
-
-install-arch-%:
- $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
- mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
- cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
- debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
- mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
- mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
- debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
- mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
- mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
- debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
- rm -f *-stamp
- dh_clean
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installman
- dh_installchangelogs ChangeLog
- dh_installdocs -A NEWS THANKS
- dh_installexamples
- dh_link
-ifeq (,$(findstring -i, $(DH_OPTIONS)))
- DH_OPTIONS= dh_strip -ppytqt-tools
- set -e; \
- for p in python-tqt python-tqt-gl python-tqtext; do \
- DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
- rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
- ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
- done
-endif
-# dh_strip
- dh_compress -X.py -X.bmp -X.ui -X.sql
- dh_fixperms
-ifneq (dh_pysupport,${DH_PYTHON2})
- ${DH_PYTHON2} --no-dbg-cleaning
-else
- ${DH_PYTHON2}
-endif
- dh_python3 --no-dbg-cleaning
- dh_sip_tqt
- dh_sip3_tqt
- dh_lintian
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/debian/_base/dependencies/pytqt/debian/README.Debian b/debian/_base/dependencies/pytqt/debian/README.Debian
new file mode 100644
index 000000000..201336f3a
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/README.Debian
@@ -0,0 +1,3 @@
+DOCUMENTATION
+-------------
+You can find doc and examples about PyTQt in the package pytqt-doc
diff --git a/debian/_base/dependencies/pytqt/debian/changelog b/debian/_base/dependencies/pytqt/debian/changelog
new file mode 100644
index 000000000..e834a6ca8
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/changelog
@@ -0,0 +1,6 @@
+pytqt (3.18.1-4ubuntu0) lucid; urgency=low
+
+ * Initial build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Nov 2011 01:16:00 -0600
+
diff --git a/debian/_base/dependencies/pytqt/debian/compat b/debian/_base/dependencies/pytqt/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/dependencies/pytqt/debian/control b/debian/_base/dependencies/pytqt/debian/control
new file mode 100644
index 000000000..d29e68c39
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/control
@@ -0,0 +1,128 @@
+Source: pytqt
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
+Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, libtqscintilla-dev, dh-python
+Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
+
+Package: python3-pytqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends}
+Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Replaces: python3-tqt
+Breaks: python3-tqt
+Description: TQt bindings for Python 3
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python3-pytqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Replaces: python3-tqt-dbg
+Breaks: python3-tqt-dbg
+Description: TQt bindings for Python 3 (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-pytqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: pytqt-doc
+Provides: ${python3:Provides}
+Replaces: python3-tqt-gl
+Breaks: python3-tqt-gl
+Description: TQt OpenGL bindings for Python 3
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python3-pytqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends}
+Replaces: python3-tqt-gl-dbg
+Breaks: python3-tqt-gl-dbg
+Description: TQt OpenGL bindings for Python 3 (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-pytqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Replaces: python3-tqtext
+Breaks: python3-tqtext
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+ * TQScintilla: a featureful TQt source code editing component based
+ on Scintilla.
+
+Package: python3-pytqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends}
+Replaces: python3-tqtext-dbg
+Breaks: python3-tqtext-dbg
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+ * TQScintilla: a featureful TQt source code editing component based
+ on Scintilla.
+
+Package: pytqt-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0~)
+Breaks: pytqt-tools (<< 4:14.0.0~)
+Description: pyuic and pylupdate for TQt
+ pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
+ user interface file and generates Python code.
+ .
+ pylupdate is the counterpart for TQt's lupdate. It updates TQt
+ Linguist translation files from Python code.
+
+Package: pytqt-dev
+Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends}
+Suggests: python3-sip-tqt-dev, sip-tqt-dev
+Replaces: python-tqt-dev
+Breaks: python-tqt-dev
+Architecture: all
+Description: TQt bindings for Python - Development files
+ Development .sip files with definitions of PyTQt classes. They
+ are needed to build PyTQt, but also as building blocks of other
+ packages based on them, like PyTDE.
+
+Package: pytqt-doc
+Section: doc
+Architecture: all
+Replaces: python-tqt-doc
+Breaks: python-tqt-doc
+Depends: ${misc:Depends}
+Suggests: python3-pytqt
+Description: TQt bindings for Python - Documentation and examples
+ Documentation and examples for the PyTQt (bindings that allow
+ the use of TQt library from within a Python script).
diff --git a/debian/_base/dependencies/python-tqt/debian/copyright b/debian/_base/dependencies/pytqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/debian/_base/dependencies/python-tqt/debian/copyright
+++ b/debian/_base/dependencies/pytqt/debian/copyright
diff --git a/debian/_base/dependencies/python-tqt/debian/docs b/debian/_base/dependencies/pytqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/_base/dependencies/python-tqt/debian/docs
+++ b/debian/_base/dependencies/pytqt/debian/docs
diff --git a/debian/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1 b/debian/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
new file mode 100644
index 000000000..9e68e9605
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
@@ -0,0 +1,83 @@
+.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.\"
+.\" Copyright 2001 Trolltech AS. All rights reserved.
+.\" Copyright 2004 Ricardo Cardenes. All rights reserved.
+.\"
+.\" This file may be distributed and/or modified under the terms of the
+.\" GNU General Public License version 2 as published by the Free Software
+.\" Foundation and appearing in the file LICENSE.GPL included in the
+.\" packaging of this file.
+.\"
+.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\" See http://www.trolltech.com/gpl/ for GPL licensing information.
+.\"
+.SH NAME
+pytqlupdate \- update TQt Linguist translation files from Python sources
+.SH SYNOPSIS
+.B pytqlupdate
+.RI "[ " options " ] " project-file...
+.SH DESCRIPTION
+This page documents the
+.B TQt Linguist Update
+tool for the TQt GUI toolkit, for Python source files.
+.B PyTQLupdate
+reads a tqmake project file (.pro file), finds the translatable
+strings in the specified source, header and interface files, and
+updates the translation files (.ts files) specified in it. The
+translation files are given to the translator who uses
+.B TQt Linguist
+to read the files and insert the translations.
+.PP
+The .ts file format is a simple human-readable XML format that can be
+used with version control systems if required.
+.PP
+.SH OPTIONS
+.TP
+.I "-help"
+Display the usage and exit.
+.TP
+.I "-noobsolete"
+Drop all obsolete strings.
+.TP
+.I "-verbose"
+Explain what is being done.
+.TP
+.I "-version"
+Display the version of
+.B pylupdate
+and exit.
+.SH USAGE
+Here is an example .pro file that can be given to
+.B pylupdate:
+.PP
+.in +4
+.nf
+SOURCES = funnydialog.py \\
+ main.py \\
+ wackywidget.py
+FORMS = fancybox.ui
+TRANSLATIONS = gnomovision_dk.ts \\
+ gnomovision_fi.ts \\
+ gnomovision_no.ts \\
+ gnomovision_se.ts
+.fi
+.in -4
+.PP
+When running
+.B pytqlupdate
+on this project file, the translatable strings in all the files
+listed in the SOURCES and FORMS entries will be put in
+the translation files listed in the TRANSLATIONS entry. Previous
+translations will be reused as far as possible, and translated
+strings that have vanished from the source files are marked obsolete.
+.SH "SEE ALSO"
+.BR tqlupdate (1),
+.BR tqlrelease (1)
+and
+.BR http://doc.trolltech.com/i18n.html
+.SH AUTHOR
+This manual page was written by Ricardo J. Cárdenes Medina
+for the Debian GNU/Linux System (but may be used by others), based
+on Trolltech's <info@trolltech.com> manual page for lupdate
diff --git a/debian/_base/dependencies/pytqt/debian/manpages/pytquic.1 b/debian/_base/dependencies/pytqt/debian/manpages/pytquic.1
new file mode 100644
index 000000000..e456074a2
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/manpages/pytquic.1
@@ -0,0 +1,74 @@
+.TH pytquic 1 "25 June 2001" \" -*- nroff -*-
+.SH NAME
+pytquic \- TQt user interface compiler for Python
+.SH SYNOPSIS
+.B pytquic
+[options] <uifile>
+.SH DESCRIPTION
+This page documents the
+.B Python User Interface Compiler
+for the TQt GUI application framework. The
+.B pytquic
+reads a user interface definition file (.ui) in XML as generated by TQt
+Designer and creates corresponding Python module.
+.PP
+.PP
+Generate implementation:
+.br
+.I "\fB pytquic [options] \fI<uifile>"
+.br
+.PP
+Generate image collection:
+.br
+.I "\fB pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
+.br
+ \fI<project>\fP: project name
+ \fI<image[1..n]>\fP: image files
+.br
+.PP
+Generate subclass implementation:
+.br
+.I "\fB pytquic [options] -subimpl <classname> \fI<uifile>"
+.br
+ \fI<classname>\fP: name of the subclass to generate
+.PP
+
+.SH GENERAL OPTIONS
+.TP
+.I "-o file"
+Write output to
+.I file
+rather than to stdout.
+.TP
+.I "-p indent"
+Set the Python
+.I indent
+in spaces (0 to use a tab)
+.TP
+.I "-tr func"
+Use
+.I func(...)
+rather than tr(...) for i18n.
+.TP
+.I -x
+Generate extra code to test the class
+.TP
+.I -test
+Generate extra code to test but not display the class
+.TP
+.I -version
+Display version of pytquic
+.TP
+.I -help
+Display this information
+
+.SH "SEE ALSO"
+.BR tquic (1)
+
+.BR http://www.trolltech.com/
+
+.BR http://www.riverbankcomputing.co.uk/
+.SH AUTHOR
+This manual page was written by Ricardo J. Cárdenes Medina
+for the Debian GNU/Linux System (but may be used by others), based
+on Trolltech's <info@trolltech.com> manual page for uic
diff --git a/debian/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/debian/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/debian/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/debian/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
diff --git a/debian/_base/dependencies/python-tqt/debian/patches/series b/debian/_base/dependencies/pytqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/debian/_base/dependencies/python-tqt/debian/patches/series
+++ b/debian/_base/dependencies/pytqt/debian/patches/series
diff --git a/debian/_base/dependencies/pytqt/debian/python3-pytqt-gl.install b/debian/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
new file mode 100644
index 000000000..dd7cab0c0
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyTQt/tqtgl.so
diff --git a/debian/_base/dependencies/pytqt/debian/python3-pytqt.install b/debian/_base/dependencies/pytqt/debian/python3-pytqt.install
new file mode 100644
index 000000000..f18aeefd0
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-pytqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/PyTQt/tqtcanvas.so
+usr/lib/python3*/*-packages/PyTQt/tqtnetwork.so
+usr/lib/python3*/*-packages/PyTQt/tqtsql.so
+usr/lib/python3*/*-packages/PyTQt/tqttable.so
+usr/lib/python3*/*-packages/PyTQt/tqtui.so
+usr/lib/python3*/*-packages/PyTQt/tqtxml.so
+usr/lib/python3*/*-packages/PyTQt/tqt.so
diff --git a/debian/_base/dependencies/pytqt/debian/python3-pytqtext.install b/debian/_base/dependencies/pytqt/debian/python3-pytqtext.install
new file mode 100644
index 000000000..511c1c0c4
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-pytqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyTQt/tqtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/debian/_base/dependencies/pytqt/debian/pytqt-dev.dirs
index 735874a93..735874a93 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-dev.dirs
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/debian/_base/dependencies/pytqt/debian/pytqt-dev.install
index 0f144be95..0f144be95 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-dev.install
diff --git a/debian/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/debian/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
new file mode 100644
index 000000000..1a3799d59
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
@@ -0,0 +1,14 @@
+# lintian test overriden as the files tripping this error are put into the source
+# of the generated package. This is a false-positive
+
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqt/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtaxcontainer/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtcanvas/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtext/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtgl/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtnetwork/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtpe/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtsql/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqttable/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtui/copying.sip
+pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtxml/copying.sip
diff --git a/debian/_base/dependencies/pytqt/debian/pytqt-doc.dirs b/debian/_base/dependencies/pytqt/debian/pytqt-doc.dirs
new file mode 100644
index 000000000..8067955f9
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/pytqt-doc/html
+usr/share/doc/pytqt-doc/examples
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/debian/_base/dependencies/pytqt/debian/pytqt-doc.examples
index c48447a3e..c48447a3e 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-doc.examples
diff --git a/debian/_base/dependencies/pytqt/debian/pytqt-doc.install b/debian/_base/dependencies/pytqt/debian/pytqt-doc.install
new file mode 100644
index 000000000..273120f41
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-doc.install
@@ -0,0 +1 @@
+doc/PyTQt.html usr/share/doc/pytqt-doc/html
diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.install b/debian/_base/dependencies/pytqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-tools.install
diff --git a/debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages b/debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages
new file mode 100644
index 000000000..a8224067a
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages
@@ -0,0 +1,2 @@
+debian/manpages/pytqlupdate.1
+debian/manpages/pytquic.1
diff --git a/debian/_base/dependencies/pytqt/debian/pytqtconfig_py3.py b/debian/_base/dependencies/pytqt/debian/pytqtconfig_py3.py
new file mode 100644
index 000000000..c25f1f56e
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/pytqtconfig_py3.py
@@ -0,0 +1,17 @@
+# import the pytqtconfig.py for the normal or the debug build
+
+import os
+import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages', 'PyTQt'))
+
+if 'd' in sys.abiflags:
+ try:
+ from pytqtconfig_d import *
+ from pytqtconfig_d import _pkg_config, _default_macros
+ except ImportError as msg:
+ raise ImportError('No module named pytqtconfig; package python3-pytqt-dbg not installed')
+else:
+ from pytqtconfig_nd import *
+ from pytqtconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/pytqt/debian/rules b/debian/_base/dependencies/pytqt/debian/rules
new file mode 100755
index 000000000..532bf34bd
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/rules
@@ -0,0 +1,191 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DH_OPTIONS
+
+-include /usr/share/python3/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
+DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc
+INSTDIR=$(CURDIR)/debian
+
+export TQTDIR=/usr/share/tqt3
+export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O1
+endif
+CXXFLAGS += "-I/usr/include/tqt"
+
+PYTHONS := $(shell py3versions -vr)
+
+DEB_PARALLEL_JOBS ?= 40
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp:
+ dh_testdir
+ mkdir -p build-$*
+ cd build-$* && echo yes \
+ | python$* ../configure.py \
+ -c -n /usr/include/tqt3 \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+ -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \
+ -l /usr/include/python$* \
+ -v /usr/share/sip-tqt/tqt \
+ -m /usr/lib/python$*/config \
+ -z \
+ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
+ touch $@
+
+dbg-build-%/configure-stamp:
+ dh_testdir
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && echo yes \
+ | python$*-dbg ../configure.py \
+ -c -n /usr/include/tqt3 \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+ -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \
+ -l /usr/include/python$*_d \
+ -v /usr/share/sip-tqt/tqt \
+ -m /usr/lib/python$*/config_d \
+ -z \
+ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
+ touch $@
+
+build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build-indep:
+
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C dbg-build-$*
+ touch $@
+
+install-indep: configure
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+ for version in ${PYTHONS}; do \
+ pylibdev=debian/pytqt-dev/$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))")/dist-packages/PyTQt;\
+ mkdir -p $$pylibdev;\
+ install -m 644 -o root -g root build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_nd.py; \
+ install -m 644 -o root -g root dbg-build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_d.py; \
+ done
+ dh_install -i
+ mkdir -p debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt
+ install -m 644 -o root -g root debian/pytqtconfig_py3.py debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt/pytqtconfig.py
+
+install-arch: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+
+ for p in ${PYTHONS} ; do \
+ $(MAKE) -f debian/rules install-arch-$$p;\
+ done
+
+ dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+ for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+ find debian/python3-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg
+ mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+ cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \
+ debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py
+ mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+ mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtgl.so \
+ debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/
+ mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt
+ mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtext.so \
+ debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
+ rm -f *-stamp
+ dh_clean
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installman
+ dh_installchangelogs ChangeLog
+ dh_installdocs -A NEWS THANKS
+ dh_installexamples
+ dh_link
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+ DH_OPTIONS= dh_strip -ppytqt-tools
+ set -e; \
+ for p in python3-pytqt python3-pytqt-gl python3-pytqtext; do \
+ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ done
+endif
+# dh_strip
+ dh_compress -X.py -X.bmp -X.ui -X.sql
+ dh_fixperms
+ dh_python3 --no-dbg-cleaning
+ dh_py3sip_tqt
+ dh_lintian
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/debian/_base/dependencies/pytqt/debian/source/format b/debian/_base/dependencies/pytqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/dependencies/pytqt/debian/source/options b/debian/_base/dependencies/pytqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/dependencies/sip4-tqt/debian/compat b/debian/_base/dependencies/sip4-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/compat
+++ b/debian/_base/dependencies/sip4-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/sip4-tqt/debian/control b/debian/_base/dependencies/sip4-tqt/debian/control
index ca64055dd..2c7df285c 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/control
+++ b/debian/_base/dependencies/sip4-tqt/debian/control
@@ -4,49 +4,27 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
+Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex
Standards-Version: 3.8.4
XS-Python-Version: all
X-Python3-Version: >= 3.0
-Package: python-sip-tqt
+Package: python3-sip-tqt
Architecture: any
Section: python
-Replaces: python-sip-tqt (<< 4:14.0.0~)
-Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4 (<< 4.10)
-Description: Python/C++ bindings generator runtime library
- SIP-TQt is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
-
-Package: python-sip-tqt-dbg
-Priority: extra
-Architecture: any
-Replaces: python-sip-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Provides: ${python:Provides}
-Depends: python-sip-tqt (= ${binary:Version}), python-all-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4-dbg (<< 4.10)
-Description: Python/C++ bindings generator runtime library (debug extension)
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
SIP-TQt is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
specificity towards C++ and Python.
.
- This package contains the extension built for the Python debug interpreter.
+ This package provides the SIP-TQt module for Python 3
-Package: python-sip-tqt-dev
+Package: python3-sip-tqt-dev
Architecture: any
Section: python
-Replaces: python-sip-tqt-dev (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dev (<< 4:14.0.0~)
-Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python-sip-tqt (>= ${source:Version})
-Provides: python-sip-dev, python-sip4-dev, sip4
-Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
+Depends: ${python3:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
Description: Python/C++ bindings generator development files
SIP-TQt is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -67,25 +45,26 @@ Description: Python/C++ bindings generator development files
- static member functions.
.
This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip-tqt.
+ needed to develop Python 3 bindings with sip-tqt.
-Package: python3-sip-tqt
+Package: python3-sip-tqt-dbg
Architecture: any
-Section: python
-Provides: ${python3:Provides}
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Section: debug
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
Description: Python 3/C++ bindings generator runtime library
SIP-TQt is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
specificity towards C++ and Python.
.
- This package provides SIP-TQt with support for Python 3
+ This package provides the SIP-TQt module for the debug build of the Python 3.
-Package: python3-sip-tqt-dev
+Package: sip-tqt-dev
Architecture: any
Section: python
-Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python3-sip-tqt (>= ${source:Version})
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Breaks: python-sip-tqt-dev (<< 4:14.1.0~)
+Recommends: python3-sip-tqt-dev
Description: Python/C++ bindings generator development files
SIP-TQt is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -105,17 +84,4 @@ Description: Python/C++ bindings generator development files
- global class instances
- static member functions.
.
- This package contains the code generator tool and the development headers
- needed to develop Python 3 bindings with sip-tqt.
-
-Package: python3-sip-tqt-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
-Description: Python 3/C++ bindings generator runtime library
- SIP-TQt is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This package contains debugging symbols for python3-sip-tqt
+ This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt.
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
new file mode 100644
index 000000000..a59025f15
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_py3sip_tqt>
+
+=head1 DESCRIPTION
+
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+ addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
+
+=cut
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
deleted file mode 100644
index 9b6387689..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip3_tqt>
-
-=head1 DESCRIPTION
-
-dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be
-used by Python 3 extensions built with sip3-tqt in order to depend on a version of
-python3-sip-tqt that exports the correct public API.
-
-=cut
-
-init();
-
-my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`;
-$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
-
-my $sip3_tqt_api_version=$sip3_tqt_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <shlomme@debian.org>
-Adapted for Python3 by
-Slávek Banko <slavek.banko@axis.cz>
-
-=cut
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
deleted file mode 100644
index c92f23529..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip_tqt>
-
-=head1 DESCRIPTION
-
-dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be
-used by Python extensions built with sip-tqt in order to depend on a version of
-python-sip-tqt that exports the correct public API.
-
-=cut
-
-init();
-
-my $sip_tqt_provides = `dpkg -s python-sip-tqt`;
-$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
-
-my $sip_tqt_api_version=$sip_tqt_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python-sip-tqt-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <shlomme@debian.org>
-
-=cut
diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
new file mode 100644
index 000000000..8539600cf
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
@@ -0,0 +1,151 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.el \{\
+. de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "DH_PY3SIP_TQT 1"
+.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_py3sip_tqt\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by
+Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
+that exports the correct public \s-1API\s0.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
deleted file mode 100644
index a4284326a..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "DH_SIP3_TQT 1"
-.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBdh_sip3_tqt\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by
-Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
-that exports the correct public \s-1API\s0.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIdebhelper\fR\|(7)
-.PP
-This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Torsten Marek <shlomme@debian.org>
-Adapted for Python3 by
-Slávek Banko <slavek.banko@axis.cz>
diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
deleted file mode 100644
index 6f0edd8f1..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "DH_SIP_TQT 1"
-.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBdh_sip_tqt\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by
-Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt
-that exports the correct public \s-1API\s0.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIdebhelper\fR\|(7)
-.PP
-This program is a part of python-sip-tqt-dev but is made to work with debhelper.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Torsten Marek <shlomme@debian.org>
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
deleted file mode 100644
index 8b1c81fa9..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/*
-../../debian/dh_sip_tqt /usr/bin/
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
deleted file mode 100644
index fdd5af4cc..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
deleted file mode 100644
index b3b0eafea..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/sip-tqt.1
-debian/manpages/dh_sip_tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
deleted file mode 100644
index e9db89432..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.*/*-packages/sip_tqt.so
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
index 416a453aa..416a453aa 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
index 43fbfa385..8c6fee21f 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -1 +1 @@
-../../debian/dh_sip3_tqt /usr/bin/
+../dh_py3sip_tqt /usr/bin/
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
new file mode 100644
index 000000000..47086f7df
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
index db0d5945a..42f51bda1 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -1 +1 @@
-debian/manpages/dh_sip3_tqt.1
+debian/manpages/dh_py3sip_tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/pyversions b/debian/_base/dependencies/sip4-tqt/debian/pyversions
deleted file mode 100644
index 57a7586e4..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.3-
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules
index b2a6d7a5a..7050c5431 100755
--- a/debian/_base/dependencies/sip4-tqt/debian/rules
+++ b/debian/_base/dependencies/sip4-tqt/debian/rules
@@ -12,9 +12,12 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
endif
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
export DH_OPTIONS
-PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1
PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
@@ -28,12 +31,9 @@ else
CFLAGS += -O2 -g
endif
-PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+PYTHONS := $(shell py3versions -vr)
--include /usr/share/python/python.mk
+-include /usr/share/python3/python.mk
ifeq (,$(py_sitename))
py_sitename = site-packages
py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
@@ -88,7 +88,6 @@ install-arch: build
dh_testdir
dh_testroot
dh_prep -a
- echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars
echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
dh_installdirs -a
# This is needed to enforce that the install-arch-% rules are
@@ -100,16 +99,10 @@ install-arch: build
$(MAKE) -f debian/rules install-arch-$$p;\
done
- for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \
- b=$$(basename $$i .so); \
- mv $$i $$(dirname $$i)/$${b}_d.so; \
- done
for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
b=$$(basename $$i .so); \
mv $$i $$(dirname $$i)/$${b}_d.so; \
done
- find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
- find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
@@ -122,29 +115,14 @@ install-arch-3.%:
install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py
install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py
install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py
- mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
- mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
- debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
+ mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/
+ mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')
+ ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \
+ debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h
mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
-install-arch-%:
- $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
- mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
- install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
- install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
- install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
- mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
- mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
- ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
- debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
- mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
- install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
@@ -159,24 +137,14 @@ binary-common:
dh_link
# don't call strip twice, it's in binary-common
ifneq (,$(findstring -a, $(DH_OPTIONS)))
- DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
- DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
- rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
- mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
- ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
endif
dh_compress -X.inv
dh_fixperms
-ifneq (dh_pysupport,${DH_PYTHON2})
- ${DH_PYTHON2} --no-dbg-cleaning
-else
- ${DH_PYTHON2}
-endif
dh_python3 --no-dbg-cleaning
dh_installdeb
dh_shlibdeps
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
new file mode 100644
index 000000000..07438bc04
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
@@ -0,0 +1 @@
+usr/bin/sip-tqt
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
new file mode 100644
index 000000000..1570b539a
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/sip-tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
deleted file mode 100644
index 33ebcb65b..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sip_tqt_config.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
- try:
- from sip_tqt_config_d import *
- from sip_tqt_config_d import _pkg_config, _default_macros
- except ImportError, msg:
- raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
-else:
- from sip_tqt_config_nd import *
- from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
index fb27b6475..a937df69a 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -1,8 +1,12 @@
# import the sip_tqt_config.py for the normal or the debug build
+import os
import sys
+import sysconfig
-if getattr(sys, "pydebug", False):
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages'))
+
+if 'd' in sys.abiflags:
try:
from sip_tqt_config_d import *
from sip_tqt_config_d import _pkg_config, _default_macros
diff --git a/debian/_base/common/cmake/debian/cdbs/cmake-versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..6bbbec325 100644
--- a/debian/_base/common/cmake/debian/cdbs/cmake-versions.pl
+++ b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
diff --git a/debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/dependencies/tde-cmake/debian/changelog b/debian/_base/dependencies/tde-cmake/debian/changelog
new file mode 100644
index 000000000..368e8ed98
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/changelog
@@ -0,0 +1,11 @@
+tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low
+
+ * Move from common submodule to dependencies.
+
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 13 Jan 2023 15:36:28 +0100
+
+cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low
+
+ * Initial release as a standalone package.
+
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 14 May 2021 12:50:36 +0200
diff --git a/debian/_base/dependencies/tde-cmake/debian/compat b/debian/_base/dependencies/tde-cmake/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/dependencies/tde-cmake/debian/control b/debian/_base/dependencies/tde-cmake/debian/control
new file mode 100644
index 000000000..54248affb
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/control
@@ -0,0 +1,19 @@
+Source: tde-cmake
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cmake (>= 3.5~)
+Standards-Version: 3.8.4
+
+Package: tde-cmake
+Architecture: all
+Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl
+Replaces: cmake-trinity (<< 4:14.1.0~)
+Breaks: cmake-trinity (<< 4:14.1.0~)
+Provides: cmake-trinity
+Description: TDE CMake modules
+ TDE uses its own set of modules and macros to simplify CMake rules.
+ .
+ This also includes the TDEL10n module that is used to generate and
+ update templates for translations and the modified version of
+ intltool-merge used to merge translations into desktop files.
diff --git a/debian/_base/common/cmake/debian/copyright b/debian/_base/dependencies/tde-cmake/debian/copyright
index 82d825030..82d825030 100644
--- a/debian/_base/common/cmake/debian/copyright
+++ b/debian/_base/dependencies/tde-cmake/debian/copyright
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1 b/debian/_base/dependencies/tde-cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1
+++ b/debian/_base/dependencies/tde-cmake/debian/patches/series
diff --git a/debian/_base/common/cmake/debian/rules b/debian/_base/dependencies/tde-cmake/debian/rules
index 95a42b3f7..95a42b3f7 100755
--- a/debian/_base/common/cmake/debian/rules
+++ b/debian/_base/dependencies/tde-cmake/debian/rules
diff --git a/debian/_base/dependencies/tde-cmake/debian/source/format b/debian/_base/dependencies/tde-cmake/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/dependencies/tde-cmake/debian/source/options b/debian/_base/dependencies/tde-cmake/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/dependencies/tde-cmake/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/tqca/debian/compat b/debian/_base/dependencies/tqca/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/tqca/debian/compat
+++ b/debian/_base/dependencies/tqca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/tqca/debian/control b/debian/_base/dependencies/tqca/debian/control
index 7da73e73c..91abded59 100644
--- a/debian/_base/dependencies/tqca/debian/control
+++ b/debian/_base/dependencies/tqca/debian/control
@@ -2,7 +2,7 @@ Source: tqca
Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libssl-dev
Standards-Version: 3.8.3
Package: libtqca
diff --git a/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/tqscintilla/debian/compat b/debian/_base/dependencies/tqscintilla/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/tqscintilla/debian/compat
+++ b/debian/_base/dependencies/tqscintilla/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/tqscintilla/debian/control b/debian/_base/dependencies/tqscintilla/debian/control
index 9d4458b48..0ce7442c2 100644
--- a/debian/_base/dependencies/tqscintilla/debian/control
+++ b/debian/_base/dependencies/tqscintilla/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
Standards-Version: 3.8.4
Package: libtqscintilla7
diff --git a/debian/_base/dependencies/tqt3/debian/README.Debian b/debian/_base/dependencies/tqt3/debian/README.Debian
index e48fe37ea..6d5c135e2 100644
--- a/debian/_base/dependencies/tqt3/debian/README.Debian
+++ b/debian/_base/dependencies/tqt3/debian/README.Debian
@@ -246,26 +246,6 @@ A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
KDE programs. Install your application's system wide configuration file
to /etc/tqt3.
-Q: I'm compiling a program and I have a compile error due to a missing
-include. Why isn't that include not present in the Debian packages anymore
-? It compiled with older versions of Debian packages of Qt !
-
-A: This may be due to two reasons: either the package still uses the old
-includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to
-the naming convention. The filenames are now all following the scheme
-
-ClassName -> classname.h.
-
-Therefore, if you are the developer of the affected program, change your
-sources according to this scheme. Qt ships with tqtrename140, a tool to
-help developers migrate their API to the Qt 3 version,
-which can help you in the transition upgrade to Qt 3.
-
-If you are affected by this as a packager, notify upstream to fix those
-problems and in the meanwhile use libtqt3-compat-headers as a build
-dependency which includes the compatibility headers that just include the
-right files from the new API again.
-
Q: I have a question not covered by this FAQ and README file. Who should I
turn to ?
diff --git a/debian/_base/dependencies/tqt3/debian/compat b/debian/_base/dependencies/tqt3/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/tqt3/debian/compat
+++ b/debian/_base/dependencies/tqt3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/tqt3/debian/control b/debian/_base/dependencies/tqt3/debian/control
index b394a2f95..cfb831620 100644
--- a/debian/_base/dependencies/tqt3/debian/control
+++ b/debian/_base/dependencies/tqt3/debian/control
@@ -2,7 +2,7 @@ Source: tqt-x11-free
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
@@ -124,7 +124,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev,
libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
-Recommends: libtqt3-compat-headers, libcups2-dev
+Recommends: libcups2-dev
Suggests: libtqt3-i18n, tqt3-doc
Description: TQt development files (Threaded)
TQt is a C++ class library optimized for graphical user interface
@@ -132,13 +132,6 @@ Description: TQt development files (Threaded)
for building threaded TQt applications as well as the libtqui.so symlink
and the necessary header files for libtqui.so. (See README.Debian and
the TQt Documentation for instructions on libtqui.so)
- .
- WARNING: If you plan to build some older TQt3 applications, you will
- most probably have to install the libtqt3-compat-headers package. It
- contains all the headers which are not part of the official TQt3 API
- anymore but which are still used by some programs. So if you encounter
- problems with missing header files, please install this package first
- before you send a bugreport.
Package: libtqt3-headers
Architecture: all
@@ -152,23 +145,6 @@ Description: TQt3 header files
with TQt3. If you want to compile or develop programs which use TQt3, you
have to install this package.
-Package: libtqt3-compat-headers
-Architecture: all
-Multi-Arch: foreign
-Section: devel
-Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
-Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
-Depends: libtqt3-headers (= ${binary:Version})
-Recommends: libtqt3-mt-dev
-Description: TQt 1.x and 2.x compatibility includes
- This package contains header files that are intended for build
- compatibility for applications that build with TQt3 but still use
- deprecated includes. It is meant as an intermediate solution and
- these header files are not part of the official TQt3 API.
- All sourcecode that is still using the headers of this package is
- subject to be changed to use the new header files which are in
- libtqt3-headers.
-
Package: tqt3-dev-tools
Architecture: any
Multi-Arch: foreign
@@ -210,17 +186,27 @@ Depends: ${shlibs:Depends}
Description: TQt3 Designer plugins
This package contains plugins for TQt3 Designer
+Package: libtqt3-apps-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Conflicts: tqt3-apps-dev (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version})
+Description: TQt3 Developer applications development libraries
+ This package contains additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
+
Package: tqt3-apps-dev
Architecture: any
Multi-Arch: no
Section: devel
Replaces: tqt3-apps-dev (<< 4:14.0.0~)
Breaks: tqt3-apps-dev (<< 4:14.0.0~)
-Depends: libtqt3-mt-dev
+Depends: libtqt3-mt-dev, libtqt3-apps-dev
Description: TQt3 Developer applications development files
This package is intended for developers who want to develop applications
- using the additional static libraries that ship with the applications
- included with TQt; the TQt Designer and the TQt Assistant.
+ using the additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
It allows integrating additional enhancements into the TQt Designer
respectively faciliate the TQt Assistant from within your TQt application
to interactively call the Assistant for displaying online help that the
@@ -299,7 +285,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
Recommends: libtqt3-mt-dev
Depends: ${shlibs:Depends}
Description: Conversion utilities for TQt3 development
- This package contains some older TQt tools (namely tqtrename140,
+ This package contains some older TQt tools (namely
tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
application developers who need to migrate any TQt application written
for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
@@ -313,7 +299,7 @@ Multi-Arch: foreign
Section: libs
Replaces: libtqt3-i18n (<< 4:14.0.0~)
Breaks: libtqt3-i18n (<< 4:14.0.0~)
-Recommends: libtqt3-mt
+Recommends: libtqt3-mt | libtqt3-mt-t64
Description: i18n files for TQt3 library
This package contains the internationalization files for the TQt library.
TQt applications that are internationalized will need to depend on this package
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install b/debian/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install
new file mode 100644
index 000000000..eea094136
--- /dev/null
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install
@@ -0,0 +1,3 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.*
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install b/debian/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
deleted file mode 100644
index d2bcbd7d6..000000000
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
+++ /dev/null
@@ -1,48 +0,0 @@
-usr/include/tqt3/ntqapp.h
-usr/include/tqt3/ntqarray.h
-usr/include/tqt3/ntqbitarry.h
-usr/include/tqt3/ntqbttngrp.h
-usr/include/tqt3/ntqchkbox.h
-usr/include/tqt3/ntqclipbrd.h
-usr/include/tqt3/ntqcollect.h
-usr/include/tqt3/ntqcollection.h
-usr/include/tqt3/ntqcombo.h
-usr/include/tqt3/ntqconnect.h
-usr/include/tqt3/ntqdatetm.h
-usr/include/tqt3/ntqdrawutl.h
-usr/include/tqt3/ntqdstream.h
-usr/include/tqt3/ntqfiledef.h
-usr/include/tqt3/ntqfiledlg.h
-usr/include/tqt3/ntqfileinf.h
-usr/include/tqt3/ntqfontinf.h
-usr/include/tqt3/ntqfontmet.h
-usr/include/tqt3/ntqgrpbox.h
-usr/include/tqt3/ntqintcach.h
-usr/include/tqt3/ntqiodev.h
-usr/include/tqt3/ntqlcdnum.h
-usr/include/tqt3/ntqlined.h
-usr/include/tqt3/ntqmenudta.h
-usr/include/tqt3/ntqmetaobj.h
-usr/include/tqt3/ntqmlined.h
-usr/include/tqt3/ntqmsgbox.h
-usr/include/tqt3/ntqmultilinedit.h
-usr/include/tqt3/ntqobjcoll.h
-usr/include/tqt3/ntqobjdefs.h
-usr/include/tqt3/ntqpdevmet.h
-usr/include/tqt3/ntqpmcache.h
-usr/include/tqt3/ntqpntarry.h
-usr/include/tqt3/ntqpopmenu.h
-usr/include/tqt3/ntqprndlg.h
-usr/include/tqt3/ntqprogbar.h
-usr/include/tqt3/ntqprogdlg.h
-usr/include/tqt3/ntqpsprn.h
-usr/include/tqt3/ntqpushbt.h
-usr/include/tqt3/ntqqueue.h
-usr/include/tqt3/ntqradiobt.h
-usr/include/tqt3/ntqrangect.h
-usr/include/tqt3/ntqscrbar.h
-usr/include/tqt3/ntqsocknot.h
-usr/include/tqt3/ntqtabdlg.h
-usr/include/tqt3/ntqtstream.h
-usr/include/tqt3/ntqwidcoll.h
-usr/include/tqt3/ntqwindefs.h
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install
index 92ebc61fb..fc421f516 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install
@@ -172,7 +172,6 @@ usr/include/tqt3/ntqrtlcodec.h
usr/include/tqt3/ntqscrollbar.h
usr/include/tqt3/ntqscrollview.h
usr/include/tqt3/ntqsemaphore.h
-usr/include/tqt3/ntqsemimodal.h
usr/include/tqt3/ntqserversocket.h
usr/include/tqt3/ntqsession.h
usr/include/tqt3/ntqsessionmanager.h
@@ -191,7 +190,6 @@ usr/include/tqt3/ntqslider.h
usr/include/tqt3/ntqsocket.h
usr/include/tqt3/ntqsocketdevice.h
usr/include/tqt3/ntqsocketnotifier.h
-usr/include/tqt3/ntqsortedlist.h
usr/include/tqt3/ntqsound.h
usr/include/tqt3/ntqspinbox.h
usr/include/tqt3/ntqsplashscreen.h
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
index dbd9a5d19..59a51ee13 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
@@ -1,4 +1,5 @@
-README
+README.md
README.immodule
+README.Qt3
README-QT.TXT
PLATFORMS
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.docs b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.docs
index dbd9a5d19..59a51ee13 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.docs
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.docs
@@ -1,4 +1,5 @@
-README
+README.md
README.immodule
+README.Qt3
README-QT.TXT
PLATFORMS
diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules
index ddc008924..36a8cc408 100755
--- a/debian/_base/dependencies/tqt3/debian/rules
+++ b/debian/_base/dependencies/tqt3/debian/rules
@@ -25,6 +25,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false)
+ifeq ($(DEB_TIME64_API),true)
+DEB_TIME64_SUFFIX = -t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
DEB_BUILD_PARALLEL ?= true
@@ -44,7 +51,7 @@ endif #hurd
# build variables (directorys)
DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libtqt3-mt
+P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX)
P_DOC = $(DEBIAN)/tqt3-doc
P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
P_HEADERS = $(DEBIAN)/libtqt3-headers
@@ -139,6 +146,22 @@ endif
post-patches::
dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libtqt3-mt\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \
+ -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \
+ -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \
+ debian/control
+endif
build build-arch: libqt-thread-stamp
build-indep:
@@ -162,7 +185,6 @@ libqt-thread-stamp: post-patches
# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
- cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/
# build tqtconv2ui
@@ -225,6 +247,20 @@ clean::
dh_clean
+ifeq ($(DEB_TIME64_API),true)
+ # revert library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "\.t64$$" | \
+ while read a; do \
+ mv $$a $${a%.t64}; \
+ done
+ ls -d debian/* | \
+ grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
+
install: build
dh_testdir
@@ -424,7 +460,7 @@ binary-arch: build install
dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html
# copy README.Debian
- for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+ for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
# install the qmake binary
rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake
@@ -461,7 +497,7 @@ binary-arch: build install
dh_makeshlibs -a $(IBASE) -V
dh_installdeb -a $(IBASE)
dh_perl -a $(IBASE)
- dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib
+ dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib
# fix shlibdeps madness
for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index d60b07fc7..43dc0a94a 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,4 +1,4 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so
usr/include/tqt3/ntqassistantclient.h
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
index 72bd7093a..60fe91b77 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -1,8 +1,8 @@
/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so
/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so
/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so
/usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
/usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
index 56e0156b5..5975d4bb9 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
@@ -1,4 +1,3 @@
-usr/bin/tqtrename140
usr/bin/tqm2ts
usr/bin/tqtmergetr
usr/bin/tqtfindtr
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-doc.docs b/debian/_base/dependencies/tqt3/debian/tqt3-doc.docs
index f08fd0f02..2630a416c 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-doc.docs
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-doc.docs
@@ -1,2 +1,3 @@
FAQ
+README.md
README-QT.TXT
diff --git a/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
+++ b/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/dependencies/tqtinterface/debian/compat b/debian/_base/dependencies/tqtinterface/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/dependencies/tqtinterface/debian/compat
+++ b/debian/_base/dependencies/tqtinterface/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control
index 4bd9ab301..88c437114 100644
--- a/debian/_base/dependencies/tqtinterface/debian/control
+++ b/debian/_base/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-apps-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev
Standards-Version: 3.8.4
Package: libtqtinterface
diff --git a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
+++ b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/libraries/kipi-plugins/debian/compat b/debian/_base/libraries/kipi-plugins/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/kipi-plugins/debian/compat
+++ b/debian/_base/libraries/kipi-plugins/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/kipi-plugins/debian/control b/debian/_base/libraries/kipi-plugins/debian/control
index d53f1f6b2..1f4b12b0a 100644
--- a/debian/_base/libraries/kipi-plugins/debian/control
+++ b/debian/_base/libraries/kipi-plugins/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, pkg-config, tdelibs14-trinity-dev,
libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev | libgpod-dev (>> 0.8.3-8),
libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
diff --git a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
+++ b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/libraries/libkdcraw/debian/compat b/debian/_base/libraries/libkdcraw/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libkdcraw/debian/compat
+++ b/debian/_base/libraries/libkdcraw/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control
index 31100f835..7c51c5b46 100644
--- a/debian/_base/libraries/libkdcraw/debian/control
+++ b/debian/_base/libraries/libkdcraw/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el]
Standards-Version: 3.8.4
diff --git a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
+++ b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/libraries/libkexiv2/debian/compat b/debian/_base/libraries/libkexiv2/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libkexiv2/debian/compat
+++ b/debian/_base/libraries/libkexiv2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libkexiv2/debian/control b/debian/_base/libraries/libkexiv2/debian/control
index c35ef2338..abbaa45c0 100644
--- a/debian/_base/libraries/libkexiv2/debian/control
+++ b/debian/_base/libraries/libkexiv2/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libexiv2-dev, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libexiv2-dev, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://www.kipi-plugins.org/
diff --git a/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
+++ b/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/libraries/libkipi/debian/compat b/debian/_base/libraries/libkipi/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libkipi/debian/compat
+++ b/debian/_base/libraries/libkipi/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libkipi/debian/control b/debian/_base/libraries/libkipi/debian/control
index ffc221b8d..ae1c63978 100644
--- a/debian/_base/libraries/libkipi/debian/control
+++ b/debian/_base/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libexif-dev, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libexif-dev, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: libkipi0-trinity-dev
diff --git a/debian/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/libraries/libksquirrel/debian/cdbs/versions.pl b/debian/_base/libraries/libksquirrel/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/libraries/libksquirrel/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/libraries/libksquirrel/debian/compat b/debian/_base/libraries/libksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libksquirrel/debian/compat
+++ b/debian/_base/libraries/libksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libksquirrel/debian/control b/debian/_base/libraries/libksquirrel/debian/control
index f012cda9c..3be598267 100644
--- a/debian/_base/libraries/libksquirrel/debian/control
+++ b/debian/_base/libraries/libksquirrel/debian/control
@@ -3,13 +3,11 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: debhelper (>= 9~), cdbs, pkg-config, libmng-dev,librsvg2-bin,
- medcon, libjasper-dev, libgif-dev, libwmf-dev, libopenexr-dev,
- djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff-dev,
- libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential,
- automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev,
+ netpbm, libiconv-hook-dev, liblcms1-dev, libjpeg-dev, libjasper-dev,
+ libgif-dev, libtiff-dev, djvulibre-bin, fig2dev | transfig, libmng-dev, libwmf-dev,
+ libopenexr-dev, medcon, librsvg2-bin, ghostscript, x11proto-core-dev,
Standards-Version: 3.8.4
-Homagepage: http://ksquirrel.sourceforge.net
Package: libksquirrel0-trinity
Architecture: any
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1 b/debian/_base/libraries/libksquirrel/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1
+++ b/debian/_base/libraries/libksquirrel/debian/patches/series
diff --git a/debian/_base/libraries/libksquirrel/debian/rules b/debian/_base/libraries/libksquirrel/debian/rules
index d761aa0a1..4453ef707 100755
--- a/debian/_base/libraries/libksquirrel/debian/rules
+++ b/debian/_base/libraries/libksquirrel/debian/rules
@@ -1,110 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-config.status: configure
- dh_testdir
-
-configure:
- dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub admin/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess admin/config.guess
-endif
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
-# Tricks for Intrepid
-#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/ksquirrel.sgml > ksquirrel.1
-
- touch $@
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/ksquirrel.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DBUILD_PICT="OFF" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/libraries/libtdeldap/debian/compat b/debian/_base/libraries/libtdeldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libtdeldap/debian/compat
+++ b/debian/_base/libraries/libtdeldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libtdeldap/debian/control b/debian/_base/libraries/libtdeldap/debian/control
index 0bedee5d7..6c8ce3269 100644
--- a/debian/_base/libraries/libtdeldap/debian/control
+++ b/debian/_base/libraries/libtdeldap/debian/control
@@ -2,7 +2,7 @@ Source: libtdeldap-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev
Standards-Version: 3.8.4
Package: libtdeldap-trinity
diff --git a/debian/_base/libraries/libtqt-perl/debian/compat b/debian/_base/libraries/libtqt-perl/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/libtqt-perl/debian/compat
+++ b/debian/_base/libraries/libtqt-perl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/libtqt-perl/debian/control b/debian/_base/libraries/libtqt-perl/debian/control
index 38d07566e..dbf0dcedb 100644
--- a/debian/_base/libraries/libtqt-perl/debian/control
+++ b/debian/_base/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs14-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs14-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
Build-Conflicts: libtqt-perl
Standards-Version: 3.8.4
diff --git a/debian/_base/libraries/python-trinity/debian/NEWS.Debian b/debian/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/debian/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/debian/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/debian/_base/libraries/pytde/debian/changelog b/debian/_base/libraries/pytde/debian/changelog
new file mode 100644
index 000000000..43df2609a
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/changelog
@@ -0,0 +1,386 @@
+pytde (3.16.3-0ubuntu4) karmic; urgency=low
+
+ * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 16 Oct 2009 14:47:00 -0600
+
+python-trinity-trinity (3.16.3-0ubuntu1) karmic; urgency=low
+
+ * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600
+
+python-trinity-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
+
+ * Jaunty rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 23 April 2009 13:02:00 -0600
+
+python-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
+
+ [ Matthias Klose ]
+ * Build for python2.6.
+
+ [ William Grant ]
+ * New upstream version. Fixes FTBFS. (LP: #333457)
+
+ -- William Grant <wgrant@ubuntu.com> Mon, 09 Mar 2009 09:04:22 +1100
+
+python-trinity (3.16.1-1ubuntu2) intrepid; urgency=low
+
+ * Actually include the fix for (LP: #229845) I claimed was in the last
+ upload
+
+ -- Scott Kitterman <scott@kitterman.com> Sat, 13 Sep 2008 16:23:41 -0400
+
+python-trinity (3.16.1-1ubuntu1) intrepid; urgency=low
+
+ * Merge from Debian unstable. Remaining Ubuntu changes:
+ - Add kubuntu_04_kdepyuic_i18n.dpatch:
+ - kdepyuic now has a useKDEi18n cmdline option, set
+ to TRUE by default, so that .py files generated from
+ .ui files are using i18n by default.
+ - fixes long options parsing, using a list of string
+ instead of a long string
+ - Patch by Stephan Hermann <sh@sourcecode.de>
+ - Build-dep on python-sip4
+ * Update debian/rules to move kdeconfig files from
+ /usr/lib/python-2.*/site-packages to /usr/lib/python2.4/site-packages so it
+ is in the normal path (LP: #229845)
+ * Dropped kubuntu_03_konsole_setpty and konsole depends since the new
+ version no longer needs them
+
+ -- Scott Kitterman <scott@kitterman.com> Wed, 18 Jun 2008 22:11:32 -0400
+
+python-trinity (3.16.1-1) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
+
+ [ Sandro Tosi ]
+ * debian/watch
+ - added missing file
+ * debian/control
+ - uniforming Vcs-Browser field
+ - bump Standard-Version to 3.7.3
+ - capitalized Python in -dbg package description
+ - removed Debian revision from versioned build-dep on libqt3-mt-dev,
+ qt3-apps-dev, qt3-dev-tools
+ * debian/rules
+ - fixed destination dir for -dev package (Closes: #446904)
+ * debian/copyright
+ - clear separation of copyright and license notice
+ - copyright and license indented with 4 spaces
+ - added upstream authors notice
+
+ [ Torsten Marek ]
+ * New upstream release 3.16.1.
+ * Included patch to dcopext.py handling
+ DCOPObj.objmethods being None (Closes: #468248).
+ * Patched dcopext.py to handle strings with non-ASCII
+ characters (Closes: #452443).
+ * Dropped 03-sip-4.7.dpatch, is now included upstream.
+ * debian/control
+ - removed dependency on konsole, because the bindings
+ for the konsole KPart have been removed.
+ * debian/rules
+ - compress debs using bzip2 to reduce the size
+ of the debug packages.
+
+ -- Torsten Marek <shlomme@debian.org> Tue, 11 Mar 2008 01:42:08 +0100
+
+python-trinity (3.16.0-4ubuntu3) hardy; urgency=low
+
+ * Remove build-dep on python-qt3 - No longer needed because pyqtconfig is
+ back in python-qt-dev (LP: #197867)
+
+ -- Scott Kitterman <scott@kitterman.com> Wed, 12 Mar 2008 16:46:05 -0400
+
+python-trinity (3.16.0-4ubuntu2) hardy; urgency=low
+
+ * Add kubuntu_04_kdepyuic_i18n.dpatch:
+ - kdepyuic now has a useKDEi18n cmdline option, set
+ to TRUE by default, so that .py files generated from
+ .ui files are using i18n by default.
+ - fixes long options parsing, using a list of string
+ instead of a long string
+ - Patch by Stephan Hermann <sh@sourcecode.de>
+
+ -- Anthony Mercatante <tonio@kubuntu> Thu, 03 Jan 2008 22:40:39 +0100
+
+python-trinity (3.16.0-4ubuntu1) hardy; urgency=low
+
+ * Merge with debian, remaining change:
+ - kubuntu_03_konsole_setpty.dpatch patch for setpty() support
+ * Build-dep on python-sip4
+ * Build-dep on python-qt3
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 18:24:06 +0000
+
+python-trinity (3.16.0-4) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * XS-Vcs-Svn, XS-Vcs-Browser and Homepage fields added
+
+ [ Torsten Marek ]
+ * Added dependency on konsole (Closes: #443819)
+
+ -- Torsten Marek <shlomme@debian.org> Mon, 01 Oct 2007 01:37:23 +0200
+
+python-trinity (3.16.0-3) unstable; urgency=low
+
+ * Merge with Ubuntu:
+ * Unable Konsole bindings.
+ * Build debug modules, but only for the default Python version
+ to keep the size sane. Debug symbols are left out as well.
+ * Adopt DCOP patch from Ubuntu.
+ * Better debian/rules file.
+
+ -- Torsten Marek <shlomme@debian.org> Sun, 16 Sep 2007 13:57:44 +0200
+
+python-trinity (3.16.0-2) unstable; urgency=low
+
+ * Include dcopext.py and dcopexport.py. (Closes: #440633)
+ * Add DPMT to uploaders field.
+
+ -- Torsten Marek <shlomme@debian.org> Mon, 03 Sep 2007 21:27:42 +0200
+
+python-trinity (3.16.0-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #427285, #440028)
+ * Rename method that is also a Python keyword. (Closes: #407894)
+
+ -- Torsten Marek <shlomme@debian.org> Sun, 12 Aug 2007 13:03:11 +0200
+
+python-trinity (3.15.2+20060422-4) unstable; urgency=low
+
+ * Build with sip 4.5 / PyQt 3.17
+
+ -- Torsten Marek <shlomme@debian.org> Wed, 6 Dec 2006 19:18:30 +0100
+
+python-trinity (3.16.0-0ubuntu14) gutsy; urgency=low
+
+ * Split C++ sources in more parts when building with GCC-4.[23].
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 22:12:01 +0200
+
+python-trinity (3.16.0-0ubuntu13) gutsy; urgency=low
+
+ * debian/control: changed the python-trinity-dev depends;
+ python-trinity-dev depends on python-trinity now.
+
+ -- Martin Böhm <martin.bohm@kubuntu.org> Mon, 06 Aug 2007 13:56:05 +0200
+
+python-trinity (3.16.0-0ubuntu12) gutsy; urgency=low
+
+ * Add patch kubuntu_00_sip-4.7.dpatch, make it compile with
+ sip 4.7 and build-dep on pyqt 3.17.3-1ubuntu1
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 03 Aug 2007 17:00:07 +0100
+
+python-trinity (3.16.0-0ubuntu11) feisty; urgency=low
+
+ * Fix copy and paste error, resulting in unusable extensions for
+ the -dbg build.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 21 Feb 2007 18:16:52 +0100
+
+python-trinity (3.16.0-0ubuntu10) feisty; urgency=low
+
+ * Don't call ldconfig in the installation target.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 20 Feb 2007 21:19:44 +0100
+
+python-trinity (3.16.0-0ubuntu9) feisty; urgency=low
+
+ * Build a python-trinity-dbg package.
+ * Use the dpatch patch system.
+ * Use single targets instead of loops inside a target.
+ * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 20 Feb 2007 02:09:12 +0100
+
+python-trinity (3.16.0-0ubuntu8) feisty; urgency=low
+
+ [ Michael Vogt ]
+ * Add kubuntu_03_konsole_setpty.diff,
+ adds setPtyFd() to sip/kpart/konsole_kpart.sip
+
+ [ Jonathan Riddell ]
+ * Update build-dep version to tdelibs and konsole 3.5.6
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 19 Jan 2007 10:43:29 +0100
+
+python-trinity (3.16.0-0ubuntu7) feisty; urgency=low
+
+ * Fix build failures on 64bit archs with python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 17:05:04 +0100
+
+python-trinity (3.16.0-0ubuntu6) feisty; urgency=low
+
+ * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 12 Jan 2007 13:18:13 +0000
+
+python-trinity (3.16.0-0ubuntu5) feisty; urgency=low
+
+ * Tighen build-dep on python-qt3 to ensure it builds
+ without visibility=hidden
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 5 Dec 2006 11:13:43 +0000
+
+python-trinity (3.16.0-0ubuntu4) feisty; urgency=low
+
+ * Rebuild against Qt without visibility=hidden
+ * Ensure patches are not applied in source package
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:53:06 +0000
+
+python-trinity (3.16.0-0ubuntu3) feisty; urgency=low
+
+ * Make python-trinity depend on konsole
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 24 Nov 2006 14:32:43 +0000
+
+python-trinity (3.16.0-0ubuntu2) feisty; urgency=low
+
+ * Add kubuntu_02_no_konsole_symlink.diff, don't create a symlink from
+ /usr/lib when running make install
+ * Create symlink from debian/rules instead
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 24 Nov 2006 00:49:46 +0000
+
+python-trinity (3.16.0-0ubuntu1) feisty; urgency=low
+
+ * New upstream release
+ * Build-depend on pyqt 3.17 and sip 4.5
+ * Add build-depends on /usr/lib/trinity/libkonsolepart.so
+ * Don't build for python 2.5, it fails to build
+ * Merge with Debian, remaining change:
+ - kubuntu_01_dcop.diff patch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 22 Nov 2006 19:03:34 +0000
+
+python-trinity (3.15.2+20060422-3) unstable; urgency=medium
+
+ * Include shlib dependencies (Closes: #378815)
+
+ -- Torsten Marek <shlomme@debian.org> Thu, 28 Sep 2006 20:25:29 +0200
+
+python-trinity (3.15.2+20060422-2) unstable; urgency=low
+
+ * Python policy transition (Closes: #373321)
+
+ -- Torsten Marek <shlomme@debian.org> Wed, 21 Jun 2006 20:44:58 +0200
+
+python-trinity (3.15.2+20060422-1) unstable; urgency=low
+
+ * New upstream release
+ * TDEConfigSkeleton works now (Closes: #310919)
+ * TDEABC is included (Closes: #362443)
+ * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
+ * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
+ * Raised debhelper compat level to 5
+ * Changed my email address to shlomme@debian.org
+ * Builds fine in pbuilder now, probably a missed build dependency
+ elsewhere (Closes: #351711)
+ * Remove build dependency no c++abi2-dev
+ * Put kdepyuic into python-trinity-dev. Thanks, Stephan Hermann
+
+ -- Torsten Marek <shlomme@debian.org> Tue, 2 May 2006 11:57:51 +0200
+
+python-trinity (3.11.3+20051013-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Torsten Marek <shlomme@gmx.net> Sun, 16 Oct 2005 11:55:45 +0200
+
+python-trinity (3.11.3+20050829-2) unstable; urgency=low
+
+ * Applied patch to klibloader.sip to fix an issue with KParts,
+ thanks to David & Paul Boddie.
+
+ -- Torsten Marek <shlomme@gmx.net> Mon, 10 Oct 2005 22:52:57 +0200
+
+python-trinity (3.11.3+20050829-1) unstable; urgency=low
+
+ * New upstream release (Closes: #304407)
+ * g++ ABI transition,
+ add c++abi2-dev to Build-Depends (Closes: #327949)
+ * Built with sip 4.3 (Closes: #327314)
+ * Built against KDE 3.4.2
+ * Added myself to Uploaders
+ * Bumped all Build-Depends and Depends on sip to
+ be >= 4.3 and << 4.4
+ * Bumped standards version to 3.6.2, no changes involved
+ * Fixed FSF address in copyright file
+ * Include upstream changelog
+ * Added package for Python 2.4
+ * Added the homepage of PyKDE to the package descriptions
+ * HTML documentations is now installed into
+ /usr/share/doc/python-trinity-doc/html
+ * pytdeconfig.py now also knows that the sip files
+ are in /usr/share/sip/trinity, not in /usr/share/sip/kde
+ (Closes: #312708)
+
+ -- Torsten Marek <shlomme@gmx.net> Tue, 20 Sep 2005 01:21:33 +0200
+
+python-trinity (3.11.3-4) unstable; urgency=high
+
+ * Added a direct dependency on the right version of sip
+ * Added python-trinity-dev (Closes: #294076)
+ * Added extra/332 so it builds with KDE 3.3.2 (Closes: #294079)
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Fri, 1 Apr 2005 16:07:33 +0100
+
+python-trinity (3.11.3-3) unstable; urgency=low
+
+ * Changed depend on PyQt >= 3.13-2 to >= 3.13 (I don't know what
+ I was thinking on)
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Thu, 9 Dec 2004 09:36:34 +0000
+
+python-trinity (3.11.3-2) unstable; urgency=low
+
+ * Rebuilt against PyQt 3.13 (bumped debian/control depends too)
+ * Applied a simple patch to build with KDE 3.3.1
+ * Adapted Thiemo Seufer's patch to make it build on mips/mipsel.
+ Closes: Bug#274469
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Mon, 4 Oct 2004 12:28:17 +0100
+
+python-trinity (3.11.3-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Mon, 30 Aug 2004 15:40:40 +0100
+
+python-trinity (3.11.1+3.11.2-2) unstable; urgency=low
+
+ * Split the number of generated object files during the building
+ process on some arches, because of hardware limitations (scarce
+ resources, or things like hitting the exported table size limit
+ on Alpha).
+ Closes: Bug#266733
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Thu, 19 Aug 2004 00:41:08 +0100
+
+python-trinity (3.11.1+3.11.2-1) unstable; urgency=low
+
+ * Applied some changes from 3.11.2-snapshot-040816 to make it
+ build with KDE 3.3.
+ * Rebuilt the against KDE 3.3 due to ABI incompatibility.
+ Closes: Bug#266506
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Wed, 18 Aug 2004 19:25:53 +0100
+
+python-trinity (3.11.1a-1) unstable; urgency=low
+
+ * Initial release of this package.
+ Closes: Bug#147965
+ * Added "pyParts.rc" from 3.7 that have been missing on the
+ examples since 3.8 (thanks Patrick McFarland for notifying it)
+ * Includes some patches from development version.
+
+ -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Sat, 19 Jun 2004 23:07:05 +0100
diff --git a/debian/_base/libraries/pytde/debian/compat b/debian/_base/libraries/pytde/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/_base/libraries/pytde/debian/control b/debian/_base/libraries/pytde/debian/control
new file mode 100644
index 000000000..91db76761
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/control
@@ -0,0 +1,52 @@
+Source: pytde
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 10~), libtqtinterface-dev, dh-python, python3-all-dev, python3-all-dbg, python3-sip-tqt, python3-sip-tqt-dev, python3-sip-tqt-dbg, pytqt-dev, python3-pytqt-dbg, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
+
+Package: python3-pytde
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt
+Breaks: python-trinity-trinity (<< 4:14.1.0~)
+Provides: ${python3:Provides}
+Description: Trinity bindings for Python 3 [Trinity]
+ Python binding module that provides wide access to the Trinity API,
+ also known as PyTDE. Using this, you'll get (for example) classes
+ from kio, kjs, tdehtml and kprint.
+
+Package: python3-pytde-dbg
+Priority: extra
+Architecture: any
+Depends: python3-pytde (= ${binary:Version}), python3-all-dbg, python3-pytqt-dbg, ${shlibs:Depends}
+Description: Trinity bindings for Python 3 (debug extensions) [Trinity]
+ Python binding module that provides wide access to the Trinity API,
+ also known as PyTDE. Using this, you'll get (for example) classes
+ from kio, kjs, tdehtml and kprint.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: pytde-dev
+Section: python
+Architecture: all
+Replaces: python-trinity-trinity-dev (<< 4:14.1.0~)
+Breaks: python-trinity-trinity-dev (<< 4:14.1.0~)
+Depends: pytqt-tools, ${python3:Depends}
+Description: Trinity bindings for Python - Development files and scripts [Trinity]
+ Development .sip files with definitions of PyTDE classes. They
+ are needed to build PyTDE, but also as building blocks of other
+ packages based on them.
+ The package also contains tdepyuic, a wrapper script around PyTQt's
+ user interface compiler.
+
+Package: pytde-doc
+Section: doc
+Architecture: all
+Replaces: python-trinity-trinity-doc (<< 4:14.1.0~)
+Breaks: python-trinity-trinity-doc (<< 4:14.1.0~)
+Description: Documentation and examples for PyTDE [Trinity]
+ General documentation and examples for PyTDE providing programming
+ tips and working code you can use to learn from.
diff --git a/debian/_base/libraries/python-trinity/debian/copyright b/debian/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/debian/_base/libraries/python-trinity/debian/copyright
+++ b/debian/_base/libraries/pytde/debian/copyright
diff --git a/debian/_base/libraries/pytde/debian/patches/.gitignore b/debian/_base/libraries/pytde/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/debian/_base/libraries/pytde/debian/pytde-dev.dirs b/debian/_base/libraries/pytde/debian/pytde-dev.dirs
new file mode 100644
index 000000000..d4b26d5db
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytde-dev.dirs
@@ -0,0 +1 @@
+usr/share/sip-tqt/trinity
diff --git a/debian/_base/libraries/pytde/debian/pytde-dev.install b/debian/_base/libraries/pytde/debian/pytde-dev.install
new file mode 100644
index 000000000..224c18bd2
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytde-dev.install
@@ -0,0 +1,2 @@
+sip/* usr/share/sip-tqt/trinity
+contrib/tdepyuic usr/bin/
diff --git a/debian/_base/libraries/pytde/debian/pytde-doc.dirs b/debian/_base/libraries/pytde/debian/pytde-doc.dirs
new file mode 100644
index 000000000..190e712a3
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytde-doc.dirs
@@ -0,0 +1,3 @@
+usr/share/doc/pytde-doc
+usr/share/doc/pytde-doc/examples
+usr/share/doc/pytde-doc/html
diff --git a/debian/_base/libraries/pytde/debian/pytde-doc.doc-base b/debian/_base/libraries/pytde/debian/pytde-doc.doc-base
new file mode 100644
index 000000000..4429e7518
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytde-doc.doc-base
@@ -0,0 +1,12 @@
+Document: PyTDE
+Title: PyTDE developer documentation
+Author: Jim Bublitz, The TDE Team
+Abstract: This documentation describes the PyTDE API
+ PyTDE contains the Python bindings to the TDE core library.
+ This manual contains general handling instructions and
+ a class reference.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/pytde-doc/html/index.html
+Files: /usr/share/doc/pytde-doc/html/*.html
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/debian/_base/libraries/pytde/debian/pytde-doc.examples
index e39721e20..e39721e20 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/debian/_base/libraries/pytde/debian/pytde-doc.examples
diff --git a/debian/_base/libraries/pytde/debian/pytde-doc.install b/debian/_base/libraries/pytde/debian/pytde-doc.install
new file mode 100644
index 000000000..484ad91a4
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytde-doc.install
@@ -0,0 +1 @@
+doc/* usr/share/doc/pytde-doc/html
diff --git a/debian/_base/libraries/pytde/debian/pytdeconfig.py b/debian/_base/libraries/pytde/debian/pytdeconfig.py
new file mode 100644
index 000000000..c12c20788
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/pytdeconfig.py
@@ -0,0 +1,17 @@
+# import the sipconfig.py for the normal or the debug build
+
+import os
+import sys
+import sysconfig
+
+sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages'))
+
+if 'd' in sys.abiflags:
+ try:
+ from pytdeconfig_d import *
+ from pytdeconfig_d import _pkg_config, _default_macros
+ except ImportError as msg:
+ raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed')
+else:
+ from pytdeconfig_nd import *
+ from pytdeconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/libraries/pytde/debian/python3-pytde.install b/debian/_base/libraries/pytde/debian/python3-pytde.install
new file mode 100644
index 000000000..a3546ced0
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/python3-pytde.install
@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/*.so
+usr/lib/python3*/*-packages/dcop*.py
diff --git a/debian/_base/libraries/pytde/debian/rules b/debian/_base/libraries/pytde/debian/rules
new file mode 100755
index 000000000..7f50df023
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/rules
@@ -0,0 +1,181 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DH_OPTIONS
+
+-include /usr/share/python3/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+export TQTDIR=/usr/share/tqt3
+export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
+
+CXXFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O2
+endif
+
+PYTHONS := $(shell py3versions -vr)
+
+GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
+ifneq (,$(filter $(GCCVER),4.2 4.3))
+ SPLIT=20
+else
+ SPLIT=4
+endif
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp:
+ dh_testdir
+ mkdir -p build-$*
+ cd build-$* && python$* ../configure.py \
+ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
+ -v /usr/share/sip-tqt/trinity -j $(SPLIT)
+ touch $@
+
+dbg-build-%/configure-stamp:
+ dh_testdir
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && python$*-dbg ../configure.py \
+ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
+ -v /usr/share/sip-tqt/trinity -j $(SPLIT)
+ touch $@
+
+build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build-indep:
+
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C dbg-build-$*
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f *-stamp
+ rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
+
+# remove autogenerated *mod.sip files and clean up sources
+ for moddir in sip/*;\
+ do\
+ if [ -d $$moddir ]; then\
+ rm -f $$moddir/` basename $${moddir}`mod.sip;\
+ fi;\
+ done
+ dh_clean
+
+install: install-indep install-arch
+
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+ dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
+ for version in ${PYTHONS};\
+ do\
+ pylib=$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))");\
+ mkdir -p debian/pytde-dev/$$pylib;\
+ install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\
+ install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\
+ install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\
+ done
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+ set -e; \
+ for version in ${PYTHONS};\
+ do\
+ $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
+ $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python3-pytde-dbg;\
+ done
+
+ dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+ mkdir -p $(CURDIR)/debian/python3-pytde/opt/trinity/lib/
+ ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python3-pytde/opt/trinity/lib/
+ for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+ find debian/python3-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+
+ find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs -A THANKS
+ dh_installexamples
+ dh_link
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+ DH_OPTIONS= dh_strip -ppython3-pytde #--dbg-package=python3-pytde-dbg
+endif
+ dh_compress -X.py -X.ui -X.dtd
+ dh_fixperms
+ dh_python3 --no-dbg-cleaning --shebang=/usr/bin/python3
+ dh_installdeb
+ dh_shlibdeps -l /opt/trinity/lib
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build build-arch clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/debian/_base/libraries/pytde/debian/source/format b/debian/_base/libraries/pytde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/libraries/pytde/debian/source/options b/debian/_base/libraries/pytde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/libraries/pytdeextensions/debian/compat b/debian/_base/libraries/pytdeextensions/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/libraries/pytdeextensions/debian/compat
+++ b/debian/_base/libraries/pytdeextensions/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/libraries/pytdeextensions/debian/control b/debian/_base/libraries/pytdeextensions/debian/control
index 224ab40da..203003669 100644
--- a/debian/_base/libraries/pytdeextensions/debian/control
+++ b/debian/_base/libraries/pytdeextensions/debian/control
@@ -3,18 +3,18 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool,
- libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev
+Build-Depends: cdbs, debhelper (>= 10~), chrpath, quilt, tdelibs14-trinity, libtool-bin, libtool,
+ libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python3-pytde,
+ pytqt-dev, python3-sip-tqt-dev, dh-python, python3-all, python3-all-dev
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
Architecture: all
-Depends: ${python:Depends}
+Depends: ${python3:Depends}
Replaces: pykdeextensions-trinity (<< 4:14.0.0~)
Breaks: pykdeextensions-trinity (<< 4:14.0.0~)
Conflicts: pykdeextensions
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
Description: Python packages to support TDE applications (scripts) [Trinity]
PyTDE Extensions is a collection of software and Python packages
to support the creation and installation of TDE applications.
@@ -26,7 +26,7 @@ Architecture: any
Section: libdevel
Replaces: libpythonize0-trinity-dev (<< 4:14.0.0~)
Breaks: libpythonize0-trinity-dev (<< 4:14.0.0~)
-Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev
+Depends: libpythonize0-trinity (= ${binary:Version}), python3-all-dev
Description: Python packages to support TDE applications (development) [Trinity]
PyTDE Extensions is a collection of software and Python packages
to support the creation and installation of TDE applications.
diff --git a/debian/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/debian/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
deleted file mode 100644
index 1a1ec9a8e..000000000
--- a/debian/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-# This class is designed to work with Python packages using the
-# 'distutils' build system and comply to the new policy established
-# during summer 2006. Use of the debhelper class to make use of the
-# new dh_python is strongly advised. (This is still left as optional
-# in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy. Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and
-# pycentral methods are available to comply with new policy. Don't forget
-# to update your 'debian/control'. (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- # warning pysupport compatibility mode
- ifneq (, $(cdbs_use_xs_field))
- $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
- endif # use XS field (compat)
-else
- ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- else
- ifneq (, $(DEB_PYTHON_SYSTEM))
- $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
- else
- ifneq (, $(cdbs_use_xs_field))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- ifneq (, $(cdbs_selected_pycompat))
- ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- endif # use pycompat
- endif # unknown method
- endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating. Here is some documentation:)
-$(warning http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'. Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
- for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
- for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
- sdir=$$(dirname $$ddir)/site-packages; \
- mkdir -p $$sdir; \
- tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
- rm -rf $$ddir; \
- done
-endif
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule. In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% :
- -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
- # check if current is in build versions
- ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
- cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
- cdbs_python_build_versions := $(cdbs_python_compile_version)
- else
- cdbs_python_build_versions := $(cdbs_python_current_version)
- endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
- ifneq (, $(cdbs_python_compile_version))
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
- else
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
- endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
- touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
- cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# This class can optionally use debhelper's commands. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
-else
- dh_pycentral -p$(cdbs_curpkg)
-endif
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
- echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
- rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
- find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/debian/_base/libraries/pytdeextensions/debian/pyversions b/debian/_base/libraries/pytdeextensions/debian/pyversions
deleted file mode 100644
index 0c043f18c..000000000
--- a/debian/_base/libraries/pytdeextensions/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.6-
diff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules
index a9c996c88..682076665 100755
--- a/debian/_base/libraries/pytdeextensions/debian/rules
+++ b/debian/_base/libraries/pytdeextensions/debian/rules
@@ -1,15 +1,9 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
+DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- include debian/python-distutils-jaunty.mk
-else
- include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
@@ -36,12 +30,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
endif
-post-patches::
- # make sure that python binary exists
- # since the existing code is still dependent on python2
- # and cdbs uses python as the default binary name
- test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"
diff --git a/debian/_base/libraries/python-trinity/debian/changelog b/debian/_base/libraries/python-trinity/debian/changelog
deleted file mode 100644
index 12485eccd..000000000
--- a/debian/_base/libraries/python-trinity/debian/changelog
+++ /dev/null
@@ -1,386 +0,0 @@
-python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low
-
- * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 16 Oct 2009 14:47:00 -0600
-
-python-trinity-trinity (3.16.3-0ubuntu1) karmic; urgency=low
-
- * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600
-
-python-trinity-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
-
- * Jaunty rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 23 April 2009 13:02:00 -0600
-
-python-trinity (3.16.2-0ubuntu1) jaunty; urgency=low
-
- [ Matthias Klose ]
- * Build for python2.6.
-
- [ William Grant ]
- * New upstream version. Fixes FTBFS. (LP: #333457)
-
- -- William Grant <wgrant@ubuntu.com> Mon, 09 Mar 2009 09:04:22 +1100
-
-python-trinity (3.16.1-1ubuntu2) intrepid; urgency=low
-
- * Actually include the fix for (LP: #229845) I claimed was in the last
- upload
-
- -- Scott Kitterman <scott@kitterman.com> Sat, 13 Sep 2008 16:23:41 -0400
-
-python-trinity (3.16.1-1ubuntu1) intrepid; urgency=low
-
- * Merge from Debian unstable. Remaining Ubuntu changes:
- - Add kubuntu_04_kdepyuic_i18n.dpatch:
- - kdepyuic now has a useKDEi18n cmdline option, set
- to TRUE by default, so that .py files generated from
- .ui files are using i18n by default.
- - fixes long options parsing, using a list of string
- instead of a long string
- - Patch by Stephan Hermann <sh@sourcecode.de>
- - Build-dep on python-sip4
- * Update debian/rules to move kdeconfig files from
- /usr/lib/python-2.*/site-packages to /usr/lib/python2.4/site-packages so it
- is in the normal path (LP: #229845)
- * Dropped kubuntu_03_konsole_setpty and konsole depends since the new
- version no longer needs them
-
- -- Scott Kitterman <scott@kitterman.com> Wed, 18 Jun 2008 22:11:32 -0400
-
-python-trinity (3.16.1-1) unstable; urgency=low
-
- [ Piotr Ożarowski ]
- * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
-
- [ Sandro Tosi ]
- * debian/watch
- - added missing file
- * debian/control
- - uniforming Vcs-Browser field
- - bump Standard-Version to 3.7.3
- - capitalized Python in -dbg package description
- - removed Debian revision from versioned build-dep on libqt3-mt-dev,
- qt3-apps-dev, qt3-dev-tools
- * debian/rules
- - fixed destination dir for -dev package (Closes: #446904)
- * debian/copyright
- - clear separation of copyright and license notice
- - copyright and license indented with 4 spaces
- - added upstream authors notice
-
- [ Torsten Marek ]
- * New upstream release 3.16.1.
- * Included patch to dcopext.py handling
- DCOPObj.objmethods being None (Closes: #468248).
- * Patched dcopext.py to handle strings with non-ASCII
- characters (Closes: #452443).
- * Dropped 03-sip-4.7.dpatch, is now included upstream.
- * debian/control
- - removed dependency on konsole, because the bindings
- for the konsole KPart have been removed.
- * debian/rules
- - compress debs using bzip2 to reduce the size
- of the debug packages.
-
- -- Torsten Marek <shlomme@debian.org> Tue, 11 Mar 2008 01:42:08 +0100
-
-python-trinity (3.16.0-4ubuntu3) hardy; urgency=low
-
- * Remove build-dep on python-qt3 - No longer needed because pyqtconfig is
- back in python-qt-dev (LP: #197867)
-
- -- Scott Kitterman <scott@kitterman.com> Wed, 12 Mar 2008 16:46:05 -0400
-
-python-trinity (3.16.0-4ubuntu2) hardy; urgency=low
-
- * Add kubuntu_04_kdepyuic_i18n.dpatch:
- - kdepyuic now has a useKDEi18n cmdline option, set
- to TRUE by default, so that .py files generated from
- .ui files are using i18n by default.
- - fixes long options parsing, using a list of string
- instead of a long string
- - Patch by Stephan Hermann <sh@sourcecode.de>
-
- -- Anthony Mercatante <tonio@kubuntu> Thu, 03 Jan 2008 22:40:39 +0100
-
-python-trinity (3.16.0-4ubuntu1) hardy; urgency=low
-
- * Merge with debian, remaining change:
- - kubuntu_03_konsole_setpty.dpatch patch for setpty() support
- * Build-dep on python-sip4
- * Build-dep on python-qt3
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 29 Nov 2007 18:24:06 +0000
-
-python-trinity (3.16.0-4) unstable; urgency=low
-
- [ Piotr Ożarowski ]
- * XS-Vcs-Svn, XS-Vcs-Browser and Homepage fields added
-
- [ Torsten Marek ]
- * Added dependency on konsole (Closes: #443819)
-
- -- Torsten Marek <shlomme@debian.org> Mon, 01 Oct 2007 01:37:23 +0200
-
-python-trinity (3.16.0-3) unstable; urgency=low
-
- * Merge with Ubuntu:
- * Unable Konsole bindings.
- * Build debug modules, but only for the default Python version
- to keep the size sane. Debug symbols are left out as well.
- * Adopt DCOP patch from Ubuntu.
- * Better debian/rules file.
-
- -- Torsten Marek <shlomme@debian.org> Sun, 16 Sep 2007 13:57:44 +0200
-
-python-trinity (3.16.0-2) unstable; urgency=low
-
- * Include dcopext.py and dcopexport.py. (Closes: #440633)
- * Add DPMT to uploaders field.
-
- -- Torsten Marek <shlomme@debian.org> Mon, 03 Sep 2007 21:27:42 +0200
-
-python-trinity (3.16.0-1) unstable; urgency=low
-
- * New upstream release. (Closes: #427285, #440028)
- * Rename method that is also a Python keyword. (Closes: #407894)
-
- -- Torsten Marek <shlomme@debian.org> Sun, 12 Aug 2007 13:03:11 +0200
-
-python-trinity (3.15.2+20060422-4) unstable; urgency=low
-
- * Build with sip 4.5 / PyQt 3.17
-
- -- Torsten Marek <shlomme@debian.org> Wed, 6 Dec 2006 19:18:30 +0100
-
-python-trinity (3.16.0-0ubuntu14) gutsy; urgency=low
-
- * Split C++ sources in more parts when building with GCC-4.[23].
-
- -- Matthias Klose <doko@ubuntu.com> Wed, 29 Aug 2007 22:12:01 +0200
-
-python-trinity (3.16.0-0ubuntu13) gutsy; urgency=low
-
- * debian/control: changed the python-trinity-dev depends;
- python-trinity-dev depends on python-trinity now.
-
- -- Martin Böhm <martin.bohm@kubuntu.org> Mon, 06 Aug 2007 13:56:05 +0200
-
-python-trinity (3.16.0-0ubuntu12) gutsy; urgency=low
-
- * Add patch kubuntu_00_sip-4.7.dpatch, make it compile with
- sip 4.7 and build-dep on pyqt 3.17.3-1ubuntu1
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 03 Aug 2007 17:00:07 +0100
-
-python-trinity (3.16.0-0ubuntu11) feisty; urgency=low
-
- * Fix copy and paste error, resulting in unusable extensions for
- the -dbg build.
-
- -- Matthias Klose <doko@ubuntu.com> Wed, 21 Feb 2007 18:16:52 +0100
-
-python-trinity (3.16.0-0ubuntu10) feisty; urgency=low
-
- * Don't call ldconfig in the installation target.
-
- -- Matthias Klose <doko@ubuntu.com> Tue, 20 Feb 2007 21:19:44 +0100
-
-python-trinity (3.16.0-0ubuntu9) feisty; urgency=low
-
- * Build a python-trinity-dbg package.
- * Use the dpatch patch system.
- * Use single targets instead of loops inside a target.
- * Set Ubuntu maintainer address.
-
- -- Matthias Klose <doko@ubuntu.com> Tue, 20 Feb 2007 02:09:12 +0100
-
-python-trinity (3.16.0-0ubuntu8) feisty; urgency=low
-
- [ Michael Vogt ]
- * Add kubuntu_03_konsole_setpty.diff,
- adds setPtyFd() to sip/kpart/konsole_kpart.sip
-
- [ Jonathan Riddell ]
- * Update build-dep version to tdelibs and konsole 3.5.6
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 19 Jan 2007 10:43:29 +0100
-
-python-trinity (3.16.0-0ubuntu7) feisty; urgency=low
-
- * Fix build failures on 64bit archs with python2.5.
-
- -- Matthias Klose <doko@ubuntu.com> Sun, 14 Jan 2007 17:05:04 +0100
-
-python-trinity (3.16.0-0ubuntu6) feisty; urgency=low
-
- * Rebuild for python2.5 as the default python version.
-
- -- Matthias Klose <doko@ubuntu.com> Fri, 12 Jan 2007 13:18:13 +0000
-
-python-trinity (3.16.0-0ubuntu5) feisty; urgency=low
-
- * Tighen build-dep on python-qt3 to ensure it builds
- without visibility=hidden
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 5 Dec 2006 11:13:43 +0000
-
-python-trinity (3.16.0-0ubuntu4) feisty; urgency=low
-
- * Rebuild against Qt without visibility=hidden
- * Ensure patches are not applied in source package
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:53:06 +0000
-
-python-trinity (3.16.0-0ubuntu3) feisty; urgency=low
-
- * Make python-trinity depend on konsole
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 24 Nov 2006 14:32:43 +0000
-
-python-trinity (3.16.0-0ubuntu2) feisty; urgency=low
-
- * Add kubuntu_02_no_konsole_symlink.diff, don't create a symlink from
- /usr/lib when running make install
- * Create symlink from debian/rules instead
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 24 Nov 2006 00:49:46 +0000
-
-python-trinity (3.16.0-0ubuntu1) feisty; urgency=low
-
- * New upstream release
- * Build-depend on pyqt 3.17 and sip 4.5
- * Add build-depends on /usr/lib/trinity/libkonsolepart.so
- * Don't build for python 2.5, it fails to build
- * Merge with Debian, remaining change:
- - kubuntu_01_dcop.diff patch
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 22 Nov 2006 19:03:34 +0000
-
-python-trinity (3.15.2+20060422-3) unstable; urgency=medium
-
- * Include shlib dependencies (Closes: #378815)
-
- -- Torsten Marek <shlomme@debian.org> Thu, 28 Sep 2006 20:25:29 +0200
-
-python-trinity (3.15.2+20060422-2) unstable; urgency=low
-
- * Python policy transition (Closes: #373321)
-
- -- Torsten Marek <shlomme@debian.org> Wed, 21 Jun 2006 20:44:58 +0200
-
-python-trinity (3.15.2+20060422-1) unstable; urgency=low
-
- * New upstream release
- * TDEConfigSkeleton works now (Closes: #310919)
- * TDEABC is included (Closes: #362443)
- * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
- * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
- * Raised debhelper compat level to 5
- * Changed my email address to shlomme@debian.org
- * Builds fine in pbuilder now, probably a missed build dependency
- elsewhere (Closes: #351711)
- * Remove build dependency no c++abi2-dev
- * Put kdepyuic into python-trinity-dev. Thanks, Stephan Hermann
-
- -- Torsten Marek <shlomme@debian.org> Tue, 2 May 2006 11:57:51 +0200
-
-python-trinity (3.11.3+20051013-1) unstable; urgency=low
-
- * New upstream release
-
- -- Torsten Marek <shlomme@gmx.net> Sun, 16 Oct 2005 11:55:45 +0200
-
-python-trinity (3.11.3+20050829-2) unstable; urgency=low
-
- * Applied patch to klibloader.sip to fix an issue with KParts,
- thanks to David & Paul Boddie.
-
- -- Torsten Marek <shlomme@gmx.net> Mon, 10 Oct 2005 22:52:57 +0200
-
-python-trinity (3.11.3+20050829-1) unstable; urgency=low
-
- * New upstream release (Closes: #304407)
- * g++ ABI transition,
- add c++abi2-dev to Build-Depends (Closes: #327949)
- * Built with sip 4.3 (Closes: #327314)
- * Built against KDE 3.4.2
- * Added myself to Uploaders
- * Bumped all Build-Depends and Depends on sip to
- be >= 4.3 and << 4.4
- * Bumped standards version to 3.6.2, no changes involved
- * Fixed FSF address in copyright file
- * Include upstream changelog
- * Added package for Python 2.4
- * Added the homepage of PyKDE to the package descriptions
- * HTML documentations is now installed into
- /usr/share/doc/python-trinity-doc/html
- * pytdeconfig.py now also knows that the sip files
- are in /usr/share/sip/trinity, not in /usr/share/sip/kde
- (Closes: #312708)
-
- -- Torsten Marek <shlomme@gmx.net> Tue, 20 Sep 2005 01:21:33 +0200
-
-python-trinity (3.11.3-4) unstable; urgency=high
-
- * Added a direct dependency on the right version of sip
- * Added python-trinity-dev (Closes: #294076)
- * Added extra/332 so it builds with KDE 3.3.2 (Closes: #294079)
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Fri, 1 Apr 2005 16:07:33 +0100
-
-python-trinity (3.11.3-3) unstable; urgency=low
-
- * Changed depend on PyQt >= 3.13-2 to >= 3.13 (I don't know what
- I was thinking on)
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Thu, 9 Dec 2004 09:36:34 +0000
-
-python-trinity (3.11.3-2) unstable; urgency=low
-
- * Rebuilt against PyQt 3.13 (bumped debian/control depends too)
- * Applied a simple patch to build with KDE 3.3.1
- * Adapted Thiemo Seufer's patch to make it build on mips/mipsel.
- Closes: Bug#274469
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Mon, 4 Oct 2004 12:28:17 +0100
-
-python-trinity (3.11.3-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Mon, 30 Aug 2004 15:40:40 +0100
-
-python-trinity (3.11.1+3.11.2-2) unstable; urgency=low
-
- * Split the number of generated object files during the building
- process on some arches, because of hardware limitations (scarce
- resources, or things like hitting the exported table size limit
- on Alpha).
- Closes: Bug#266733
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Thu, 19 Aug 2004 00:41:08 +0100
-
-python-trinity (3.11.1+3.11.2-1) unstable; urgency=low
-
- * Applied some changes from 3.11.2-snapshot-040816 to make it
- build with KDE 3.3.
- * Rebuilt the against KDE 3.3 due to ABI incompatibility.
- Closes: Bug#266506
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Wed, 18 Aug 2004 19:25:53 +0100
-
-python-trinity (3.11.1a-1) unstable; urgency=low
-
- * Initial release of this package.
- Closes: Bug#147965
- * Added "pyParts.rc" from 3.7 that have been missing on the
- examples since 3.8 (thanks Patrick McFarland for notifying it)
- * Includes some patches from development version.
-
- -- Ricardo Javier Cardenes Medina <rcardenes@debian.org> Sat, 19 Jun 2004 23:07:05 +0100
diff --git a/debian/_base/libraries/python-trinity/debian/compat b/debian/_base/libraries/python-trinity/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/libraries/python-trinity/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/libraries/python-trinity/debian/control b/debian/_base/libraries/python-trinity/debian/control
deleted file mode 100644
index 633a24c00..000000000
--- a/debian/_base/libraries/python-trinity/debian/control
+++ /dev/null
@@ -1,56 +0,0 @@
-Source: python-trinity-trinity
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) | dh-python, python-all, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
-Standards-Version: 3.8.4
-Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
-
-Package: python-trinity-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
-Replaces: python-trinity-trinity (<< 4:14.0.0~)
-Breaks: python-trinity-trinity (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Conflicts: python-trinity-trinity
-Description: Trinity bindings for Python [Trinity]
- Python binding module that provides wide access to the Trinity API,
- also known as PyTDE. Using this, you'll get (for example) classes
- from kio, kjs, tdehtml and kprint.
-
-Package: python-trinity-trinity-dbg
-Priority: extra
-Architecture: any
-Replaces: python-trinity-trinity-dbg (<< 4:14.0.0~)
-Breaks: python-trinity-trinity-dbg (<< 4:14.0.0~)
-Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-tqt-dbg, ${shlibs:Depends}
-Description: Trinity bindings for Python (debug extensions) [Trinity]
- Python binding module that provides wide access to the Trinity API,
- also known as PyTDE. Using this, you'll get (for example) classes
- from kio, kjs, tdehtml and kprint.
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-trinity-trinity-dev
-Section: python
-Architecture: all
-Replaces: python-trinity-trinity-dev (<< 4:14.0.0~)
-Breaks: python-trinity-trinity-dev (<< 4:14.0.0~)
-Depends: pytqt-tools, ${python:Depends}
-Description: Trinity bindings for Python - Development files and scripts [Trinity]
- Development .sip files with definitions of PyTDE classes. They
- are needed to build PyTDE, but also as building blocks of other
- packages based on them.
- The package also contains tdepyuic, a wrapper script around PyTQt's
- user interface compiler.
-
-Package: python-trinity-trinity-doc
-Section: doc
-Architecture: all
-Replaces: python-trinity-trinity-doc (<< 4:14.0.0~)
-Breaks: python-trinity-trinity-doc (<< 4:14.0.0~)
-Description: Documentation and examples for PyTDE [Trinity]
- General documentation and examples for PyTDE providing programming
- tips and working code you can use to learn from.
diff --git a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py b/debian/_base/libraries/python-trinity/debian/pytdeconfig.py
deleted file mode 100644
index eac264752..000000000
--- a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
- try:
- from pytdeconfig_d import *
- except ImportError, msg:
- raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed'
-else:
- from pytdeconfig_nd import *
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
deleted file mode 100644
index 62e887ce2..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-opt/trinity/share/sip-tqt/trinity
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
deleted file mode 100644
index 17b8480ab..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-sip/* opt/trinity/share/sip-tqt/trinity
-contrib/tdepyuic opt/trinity/bin/
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
deleted file mode 100644
index 96235463f..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/doc/python-trinity-trinity-doc
-usr/share/doc/python-trinity-trinity-doc/examples
-usr/share/doc/python-trinity-trinity-doc/html
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
deleted file mode 100644
index bb9705168..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: PyTDE
-Title: PyTDE developer documentation
-Author: Jim Bublitz, The TDE Team
-Abstract: This documentation describes the PyTDE API
- PyTDE contains the Python bindings to the TDE core library.
- This manual contains general handling instructions and
- a class reference.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html
-Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
deleted file mode 100644
index 20b273acb..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/* usr/share/doc/python-trinity-trinity-doc/html
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
deleted file mode 100644
index facee2907..000000000
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python*/*-packages/*.so
-usr/lib/python*/*-packages/dcop*.py
-
diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules
deleted file mode 100755
index 532c74f7f..000000000
--- a/debian/_base/libraries/python-trinity/debian/rules
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-export QTDIR=/usr/share/qt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
-
-CXXFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-
-PYTHONS := $(shell pyversions -vr debian/control)
-DBG_PYTHONS := $(shell pyversions -vd)
-
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
- SPLIT=20
-else
- SPLIT=4
-endif
-
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-
-configure: $(PYTHONS:%=build-%/configure-stamp) $(DBG_PYTHONS:%=dbg-build-%/configure-stamp)
-
-build-%/configure-stamp:
- dh_testdir
- mkdir -p build-$*
- cd build-$* && python$* ../configure.py \
- -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
- -e python$* \
- -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
- touch $@
-
-dbg-build-%/configure-stamp:
- dh_testdir
- mkdir -p dbg-build-$*
- cd dbg-build-$* && python$*-dbg ../configure.py \
- -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
- -e python$* \
- -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
- touch $@
-
-build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp)
-build-indep:
-
-build-%/build-stamp: build-%/configure-stamp
- dh_testdir
- $(MAKE) -C build-$*
- touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
- dh_testdir
- $(MAKE) -C dbg-build-$*
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f *-stamp
- rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%)
-
-# remove autogenerated *mod.sip files and clean up sources
- for moddir in sip/*;\
- do\
- if [ -d $$moddir ]; then\
- rm -f $$moddir/` basename $${moddir}`mod.sip;\
- fi;\
- done
- dh_clean
-
-install: install-indep install-arch
-
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
- for version in ${PYTHONS};\
- do\
- mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\
- cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\
- cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\
- done
- for version in ${DBG_PYTHONS};\
- do\
- cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\
- done
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -a
- dh_installdirs -a
- set -e; \
- for version in ${PYTHONS};\
- do\
- $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
- done
-
- set -e; \
- for version in ${DBG_PYTHONS}; do \
- $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\
- done
-
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
- mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
- ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
- for i in $$(find debian/python-*-dbg -name '*.so'); do \
- b=$$(basename $$i .so); \
- mv $$i $$(dirname $$i)/$${b}_d.so; \
- done
- find debian/python-*-dbg ! -type d \
- ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
-
- find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs -A THANKS
- dh_installexamples
- dh_link
-ifeq (,$(findstring -i, $(DH_OPTIONS)))
- DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg
-endif
- dh_compress -X.py -X.ui -X.dtd
- dh_fixperms
- ${DH_PYTHON2}
- dh_installdeb
- dh_shlibdeps -l /opt/trinity/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/Makefile b/debian/_base/metapackages/desktop-base/Makefile
index 6552ca238..6552ca238 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/Makefile
+++ b/debian/_base/metapackages/desktop-base/Makefile
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-640x480.png b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
index b545a70b5..b545a70b5 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-640x480.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-widescreen.svg b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
index 342510f15..342510f15 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper-widescreen.svg
+++ b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper.svg b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper.svg
index 668819dff..668819dff 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/debian-blueish-wallpaper.svg
+++ b/debian/_base/metapackages/desktop-base/backgrounds/debian-blueish-wallpaper.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.png b/debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.png
index f87aa89e6..f87aa89e6 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.xcf.gz b/debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
index ce1826b7f..ce1826b7f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/gnome-debian-sid-wp.xcf.gz
+++ b/debian/_base/metapackages/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.png b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.png
index f1cc99099..f1cc99099 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.svg.tar.bz2 b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
index 574c298c2..574c298c2 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-grub.svg.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.png b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
index d79d09dba..d79d09dba 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.svg b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
index 71d1fe759..71d1fe759 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.png b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
index 8908e000c..8908e000c 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.svg b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
index 622087d7f..622087d7f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/moreblue-orbit-wallpaper.svg
+++ b/debian/_base/metapackages/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.png b/debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.png
+++ b/debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.xcf.tar.bz2 b/debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
index 2222bac6b..2222bac6b 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/backgrounds/nightly-wallpaper.xcf.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-desktop-logo.png b/debian/_base/metapackages/desktop-base/debian-desktop-logo.png
index b1e768aef..b1e768aef 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-desktop-logo.png
+++ b/debian/_base/metapackages/desktop-base/debian-desktop-logo.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-homepage.desktop b/debian/_base/metapackages/desktop-base/debian-homepage.desktop
index 384bd14fe..384bd14fe 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-homepage.desktop
+++ b/debian/_base/metapackages/desktop-base/debian-homepage.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-reference.desktop b/debian/_base/metapackages/desktop-base/debian-reference.desktop
index 36a7992e4..36a7992e4 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-reference.desktop
+++ b/debian/_base/metapackages/desktop-base/debian-reference.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-security.desktop b/debian/_base/metapackages/desktop-base/debian-security.desktop
index 43d6a1e42..43d6a1e42 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/debian-security.desktop
+++ b/debian/_base/metapackages/desktop-base/debian-security.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/compat b/debian/_base/metapackages/desktop-base/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/desktop-base/debian/compat
+++ b/debian/_base/metapackages/desktop-base/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/desktop-base/debian/control b/debian/_base/metapackages/desktop-base/debian/control
index d41666eb1..7d06a0f3b 100644
--- a/debian/_base/metapackages/desktop-base/debian/control
+++ b/debian/_base/metapackages/desktop-base/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Loïc Minier <lool@dooz.org>,
Fathi Boudra <fabo@debian.org>,
Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
# libusplash-dev, imagemagick, librsvg2-bin
Standards-Version: 3.8.3
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/.gitignore b/debian/_base/metapackages/desktop-base/debian/distrospecific/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/metapackages/desktop-base/debian/distrospecific/.gitignore
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.icon b/debian/_base/metapackages/desktop-base/emblems/emblem-debian.icon
index 2fbbb0a5b..2fbbb0a5b 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.icon
+++ b/debian/_base/metapackages/desktop-base/emblems/emblem-debian.icon
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.png b/debian/_base/metapackages/desktop-base/emblems/emblem-debian.png
index 4927922cc..4927922cc 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/emblems/emblem-debian.png
+++ b/debian/_base/metapackages/desktop-base/emblems/emblem-debian.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/gnome-backgrounds.xml b/debian/_base/metapackages/desktop-base/gnome-backgrounds.xml
index 9391aa82e..9391aa82e 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/gnome-backgrounds.xml
+++ b/debian/_base/metapackages/desktop-base/gnome-backgrounds.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/debian/_base/metapackages/desktop-base/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
+++ b/debian/_base/metapackages/desktop-base/kompmgr-rc-files/compton-tde.conf
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/debian/_base/metapackages/desktop-base/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/debian/_base/metapackages/desktop-base/kompmgr-rc-files/xcompmgrrc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
index e582ab8c0..e582ab8c0 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
index bc20c1153..bc20c1153 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_active_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
index 0572ce2eb..0572ce2eb 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_active_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_bottom.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
index 954cbae6f..954cbae6f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_bottom.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
index fe09df872..fe09df872 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_top.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
index cc3e4ae43..cc3e4ae43 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-default/splash_top.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Background.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
index d518fd78b..d518fd78b 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Background.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
index 7b3cba641..7b3cba641 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
index 9017a337b..9017a337b 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
index 86ed5f470..86ed5f470 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/debian-moreblue-moodin/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
index fadcb633f..fadcb633f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
index bd9d372d2..bd9d372d2 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_active_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
index 430cf5263..430cf5263 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_bottom.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
index c62f5372b..c62f5372b 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_bottom.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
index aef8079f3..aef8079f3 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_top.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
index 8680cc018..8680cc018 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-default/splash_top.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Background.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
index ac8dd37d3..ac8dd37d3 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Background.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
index 51d1fca48..51d1fca48 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
index 90e503689..90e503689 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/moreblue-orbit-moodin/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Preview.png
index 8183df8e3..8183df8e3 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Theme.rc
index 2a947a8f5..2a947a8f5 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
index 4c842babd..4c842babd 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_active_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
index d12e12ad8..d12e12ad8 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_active_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_bottom.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
index d2fe82b23..d2fe82b23 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_bottom.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_inactive_bar.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
index b4443a4d2..b4443a4d2 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_inactive_bar.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_top.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_top.png
index 7fb403585..7fb403585 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-default/splash_top.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-default/splash_top.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/1.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/1.png
index a2f883e59..a2f883e59 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/1.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/1.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/2.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/2.png
index 4ce019d78..4ce019d78 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/2.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/2.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/3.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/3.png
index 26811fce2..26811fce2 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/3.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/3.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/4.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/4.png
index ed5b3438c..ed5b3438c 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/4.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/4.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/5.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/5.png
index dd4220d28..dd4220d28 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/5.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/5.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/6.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/6.png
index 40f348c81..40f348c81 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/6.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/6.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/7.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/7.png
index f76c71bc4..f76c71bc4 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/7.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/7.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/8.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/8.png
index 800e1d284..800e1d284 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/8.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/8.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Preview.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Preview.png
index 4b318ce83..4b318ce83 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Preview.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Theme.rc b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
index 377c9108e..377c9108e 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/Theme.rc
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/background.png b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/background.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/background.png
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/background.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
index e633691ca..e633691ca 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.png b/debian/_base/metapackages/desktop-base/pixmaps/debian-security.png
index 672ceca49..672ceca49 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.png
+++ b/debian/_base/metapackages/desktop-base/pixmaps/debian-security.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.xcf b/debian/_base/metapackages/desktop-base/pixmaps/debian-security.xcf
index e806fcd2c..e806fcd2c 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/pixmaps/debian-security.xcf
+++ b/debian/_base/metapackages/desktop-base/pixmaps/debian-security.xcf
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/kdesktoprc b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/kdesktoprc
index 9aa289c7e..9aa289c7e 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/kdesktoprc
+++ b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/kdesktoprc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/ksplashrc b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/ksplashrc
index 8bfbc19d1..8bfbc19d1 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/ksplashrc
+++ b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/ksplashrc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/twinrc
index b3301f1db..b3301f1db 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/share/config/twinrc
+++ b/debian/_base/metapackages/desktop-base/profiles/tde-profile/share/config/twinrc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdeglobals b/debian/_base/metapackages/desktop-base/profiles/tde-profile/tdeglobals
index 507fde04d..507fde04d 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdeglobals
+++ b/debian/_base/metapackages/desktop-base/profiles/tde-profile/tdeglobals
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdm/backgroundrc b/debian/_base/metapackages/desktop-base/profiles/tde-profile/tdm/backgroundrc
index 2db7e8c45..2db7e8c45 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/tde-profile/tdm/backgroundrc
+++ b/debian/_base/metapackages/desktop-base/profiles/tde-profile/tdm/backgroundrc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-session.rc b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
index 9dcd0663c..9dcd0663c 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-session.rc
+++ b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-splash.rc b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
index fee4fd455..fee4fd455 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4-session/xfce4-splash.rc
+++ b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4/mcs_settings/desktop.xml b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
index a1e4ea3ea..a1e4ea3ea 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
+++ b/debian/_base/metapackages/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.png b/debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.png
index 790b7ee75..790b7ee75 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.png
+++ b/debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.xcf.gz b/debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
index e4e3157d4..e4e3157d4 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-debian-sid-splash.xcf.gz
+++ b/debian/_base/metapackages/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-splash-curves.png b/debian/_base/metapackages/desktop-base/splash/gnome-splash-curves.png
index 98342bd13..98342bd13 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/gnome-splash-curves.png
+++ b/debian/_base/metapackages/desktop-base/splash/gnome-splash-curves.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.png b/debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.png
index 54302fdb3..54302fdb3 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.png
+++ b/debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.svg.tar.bz2 b/debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
index 979bd5063..979bd5063 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/moreblue-orbit-splash.svg.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.png b/debian/_base/metapackages/desktop-base/splash/nightly-splash.png
index f9dc212b5..f9dc212b5 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.png
+++ b/debian/_base/metapackages/desktop-base/splash/nightly-splash.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.xcf.tar.bz2 b/debian/_base/metapackages/desktop-base/splash/nightly-splash.xcf.tar.bz2
index bb8c73087..bb8c73087 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splash/nightly-splash.xcf.tar.bz2
+++ b/debian/_base/metapackages/desktop-base/splash/nightly-splash.xcf.tar.bz2
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/VeraSans.ttf b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
index 58cd6b5e6..58cd6b5e6 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/VeraSans.ttf
+++ b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-bw.png b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-bw.png
index 233bcc116..233bcc116 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-bw.png
+++ b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-bw.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-color.png b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-color.png
index e65a562ce..e65a562ce 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/background-color.png
+++ b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/background-color.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/theme.xml b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/theme.xml
index ece58c6df..ece58c6df 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/splashy/moreblue-orbit/theme.xml
+++ b/debian/_base/metapackages/desktop-base/splashy/moreblue-orbit/theme.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
index b2a3511af..b2a3511af 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
index 336b3d1ab..336b3d1ab 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/background.svg b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/background.svg
index 4bed799ac..4bed799ac 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/background.svg
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/background.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/boundingbox.png b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
index 3ed8404dc..3ed8404dc 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/boundingbox.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/debian-moreblue.xml b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
index 703e0d0f2..703e0d0f2 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/debian-moreblue.xml
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-reboot.png b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-reboot.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-session.png b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/icon-session.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/icon-session.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/screenshot.png b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/screenshot.png
index fc3e9982c..fc3e9982c 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/screenshot.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/screenshot.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/swirl.svg b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/swirl.svg
index afdf212e3..afdf212e3 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/debian-moreblue/swirl.svg
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/debian-moreblue/swirl.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
index b4e9fb6d9..b4e9fb6d9 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
index 4b90c02ab..4b90c02ab 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.png b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.png
index 69916901f..69916901f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.svg b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.svg
index b72c3b2f4..b72c3b2f4 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/background.svg
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/background.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/boundingbox.png b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
index a09afa171..a09afa171 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/boundingbox.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-reboot.png b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-reboot.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-session.png b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/icon-session.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/moreblue-orbit.xml b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
index 2d1234bcd..2d1234bcd 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/moreblue-orbit.xml
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/screenshot.png b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
index d8a494dbf..d8a494dbf 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/moreblue-orbit/screenshot.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/GdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
index 7e64bfcc0..7e64bfcc0 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/KdmGreeterTheme.desktop b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
index 2eae79097..2eae79097 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/KdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions.png
index 41aba5d88..41aba5d88 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions_inactive.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions_inactive.png
index a1f0345ed..a1f0345ed 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/Sessions_inactive.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/Sessions_inactive.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/System.png
index 240c2d9b5..240c2d9b5 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/System.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System_inactive.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/System_inactive.png
index 4bea4e785..4bea4e785 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/System_inactive.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/System_inactive.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/background.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/background.png
index e7a091ee7..e7a091ee7 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/background.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/background.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/boundingbox.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/boundingbox.png
index 223b74725..223b74725 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/boundingbox.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/boundingbox.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/nightly.xml b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/nightly.xml
index 22c6c1bd8..22c6c1bd8 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/nightly.xml
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/nightly.xml
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/screenshot.png b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/screenshot.png
index cf5236829..cf5236829 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/nightly/screenshot.png
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/nightly/screenshot.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base b/debian/_base/metapackages/desktop-base/tdm-theme/tdm.d/10_desktop-base
index 280a58042..280a58042 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base
+++ b/debian/_base/metapackages/desktop-base/tdm-theme/tdm.d/10_desktop-base
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/Makefile b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/Makefile
index 6f677f506..6f677f506 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/Makefile
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/Makefile
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/background.svg b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/background.svg
index d60e2ed74..d60e2ed74 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/background.svg
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/background.svg
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/cmap.gif b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/cmap.gif
index ac8c4b80a..ac8c4b80a 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/cmap.gif
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/cmap.gif
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/progress.png b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/progress.png
index de57c529f..de57c529f 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/progress.png
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/progress.png
Binary files differ
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.c b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.c
index 59632522e..59632522e 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.c
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.c
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.in b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.in
index ae8c4dd26..ae8c4dd26 100644
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/theme.in
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/theme.in
diff --git a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/themesetup.sh b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/themesetup.sh
index 81f0bd882..81f0bd882 100755
--- a/debian/_base/metapackages/desktop-base/debian/distrospecific/usplash/moreblue-orbit/themesetup.sh
+++ b/debian/_base/metapackages/desktop-base/usplash/moreblue-orbit/themesetup.sh
diff --git a/debian/_base/metapackages/meta-tde/debian/compat b/debian/_base/metapackages/meta-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/meta-tde/debian/compat
+++ b/debian/_base/metapackages/meta-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/meta-tde/debian/control b/debian/_base/metapackages/meta-tde/debian/control
index 8a6423ec0..52e9de856 100644
--- a/debian/_base/metapackages/meta-tde/debian/control
+++ b/debian/_base/metapackages/meta-tde/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <trigger+debian@space-based.de>
-Build-Depends: debhelper (>= 9~)
+Build-Depends: debhelper (>= 10~)
Standards-Version: 3.7.3
Homepage: http://www.trinitydesktop.org
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/Makefile b/debian/_base/metapackages/redmond-default-settings-ii/Makefile
index 7270b7db6..7270b7db6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/Makefile
+++ b/debian/_base/metapackages/redmond-default-settings-ii/Makefile
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/background.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/background.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/head.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/head.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/head.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/stylesheet.css b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/amarok/stylesheet.css
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/amarok/stylesheet.css
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/edgyWallpaper.tar.gz b/debian/_base/metapackages/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/edgyWallpaper.tar.gz
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/enterprise-desktop.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/enterprise-desktop.png
index 4b1f883f4..4b1f883f4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/enterprise-desktop.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/enterprise-desktop.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
index 4035e27f7..4035e27f7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
index a57917b8f..a57917b8f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
index e1a2648ef..e1a2648ef 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
index 7ed5de679..7ed5de679 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
index c1c8ed284..c1c8ed284 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
index 052defc97..052defc97 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
index 79c19f6aa..79c19f6aa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
index 62a48fd3c..62a48fd3c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
index f69fd57b3..f69fd57b3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
index 18efbfac8..18efbfac8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
index 3b7723190..3b7723190 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
index 439b94c30..439b94c30 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
index 4eb7120af..4eb7120af 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
index 911dfe880..911dfe880 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
index 70a2419bf..70a2419bf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
index 29fe66b86..29fe66b86 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
index c24c5f25a..c24c5f25a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
index 5d5cd8f7a..5d5cd8f7a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
index f379812ae..f379812ae 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
index d877af31f..d877af31f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
index 457eb7c30..457eb7c30 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
index e178dbc96..e178dbc96 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
index 4e6ba5f0d..4e6ba5f0d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
index 6eb18effe..6eb18effe 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg
index 7a598f8fa..7a598f8fa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
index 21f1db0a9..21f1db0a9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg
index 3f775c120..3f775c120 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg
index 127636b9c..127636b9c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
index 535b5a960..535b5a960 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
index 6a96381e8..6a96381e8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
index 7e3b5c237..7e3b5c237 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
index 3cbc9d021..3cbc9d021 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
index 66d8724a9..66d8724a9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
index 1553e7ede..1553e7ede 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
index 05707f46b..05707f46b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
index 0eeb356d1..0eeb356d1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
index 53dfbe91b..53dfbe91b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
index 9ae3f39bd..9ae3f39bd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
index 4bb9e4776..4bb9e4776 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
index 2f625a0d5..2f625a0d5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
index b38ee6b2a..b38ee6b2a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
index 480dfacfc..480dfacfc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
index 651c1dfc5..651c1dfc5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
index 2815769b7..2815769b7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
index dd11781b1..dd11781b1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
index f2d724ef7..f2d724ef7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
index 4e67b2a90..4e67b2a90 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
index 07337d9d5..07337d9d5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
index 699fc1e92..699fc1e92 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
index 0f82327b5..0f82327b5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
index 7300ba787..7300ba787 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
index b3227967a..b3227967a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
index 46d47ff57..46d47ff57 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
index 08c0d35ce..08c0d35ce 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
index e8834b503..e8834b503 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
index 99b6d84d7..99b6d84d7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
index bcfeb457c..bcfeb457c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
index cd3b16311..cd3b16311 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
index e3bc89bd9..e3bc89bd9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
index 81cac6f6d..81cac6f6d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
index 12ecd19df..12ecd19df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
index 1bf5576c1..1bf5576c1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
index d4a8a695a..d4a8a695a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
index af08bfd29..af08bfd29 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
index 7cbaf7f39..7cbaf7f39 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
index 30234263f..30234263f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
index 631b5297b..631b5297b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
index a0e458ce3..a0e458ce3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
index 25c677bbd..25c677bbd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
index a1fa8d5bb..a1fa8d5bb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
index 701db348c..701db348c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
index dd8319f19..dd8319f19 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
index 00fe97041..00fe97041 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
index 9fc47822e..9fc47822e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
index e3d0db71e..e3d0db71e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
index bb4e1fa6a..bb4e1fa6a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
index e2dbb6eb9..e2dbb6eb9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
index 516440ff0..516440ff0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
index c80e146fc..c80e146fc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
index 2d770f592..2d770f592 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
index 59c3fc3ab..59c3fc3ab 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
index c10cddd17..c10cddd17 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
index c1dda4800..c1dda4800 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
index 6d1986090..6d1986090 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
index 454750639..454750639 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
index 75bf53846..75bf53846 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
index 47ead04aa..47ead04aa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
index bb1253f3f..bb1253f3f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
index aea4f9fc8..aea4f9fc8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
index 404004c19..404004c19 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
index 0f7d98144..0f7d98144 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
index 37d0f2015..37d0f2015 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
index a8a1ec58f..a8a1ec58f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
index 7b1673249..7b1673249 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
index eeafc3e93..eeafc3e93 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
index dc835d4d3..dc835d4d3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
index 1f46d48b7..1f46d48b7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
index d2322d955..d2322d955 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
index b08244f2d..b08244f2d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
index 7cec0df71..7cec0df71 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
index bf2d55534..bf2d55534 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
index f4e905f77..f4e905f77 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
index a6cc84cd2..a6cc84cd2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
index 8bb7904c6..8bb7904c6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
index 6b92df4c9..6b92df4c9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
index 295544140..295544140 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
index 6296ebb49..6296ebb49 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
index cfd571d31..cfd571d31 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/index.desktop b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/index.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/index.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_admin.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_admin.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_admin.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_away.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_away.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_away.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_halfop.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_halfop.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_halfop.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_normal.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_op.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_op.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_op.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_owner.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_owner.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_owner.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_voice.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/konversation/irc_voice.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/konversation/irc_voice.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Dialog.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Preview.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Preview.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/ReadMe.txt b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt
index 3c7d9763d..3c7d9763d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/ReadMe.txt
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Theme.rc b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Theme.rc
index d0bd905c5..d0bd905c5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/Theme.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/Theme.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/gpl.txt b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/ksplash/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/ksplash/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-kmenu-side.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-konqueror-background.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-login.ogg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-login.ogg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-login.ogg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg
index c24aead02..c24aead02 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-panel.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-panel.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-panel.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg
index e62d362e3..e62d362e3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop
index 3f755fe75..3f755fe75 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/background.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/background.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/default.css b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/default.css
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/default.css
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/head.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/head.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/head.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/layout.html b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/metabar/layout.html
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/metabar/layout.html
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml
index 5f0fb8bf6..5f0fb8bf6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/Dialog.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_normal.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_over.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_over.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_pressed.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/enter_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/gpl.txt b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/kubuntu.xml b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/kubuntu.xml
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/preview.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/preview.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_normal.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_over.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_over.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_pressed.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/tdm-theme/system_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/trinity.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/16x16/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/trinity.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/22x22/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/trinity.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/32x32/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/trinity.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/48x48/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/gear.3ds b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/throbber/gear.3ds
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/throbber/gear.3ds
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient-inactive.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient-inactive.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient.png b/debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/artwork/window-decoration-gradient.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/artwork/window-decoration-gradient.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/backgroundrc b/debian/_base/metapackages/redmond-default-settings-ii/backgroundrc
index abd9c21e5..abd9c21e5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/backgroundrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/backgroundrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc b/debian/_base/metapackages/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc
index e4ed11dd7..e4ed11dd7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/circle b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/circle
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/copy b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/copy
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crosshair b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/crosshair
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dot b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dot
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dotbox b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/dotbox
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_large b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_large
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_small b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draft_small
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draped_box b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/draped_box
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fleur b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/fleur
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand1 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand1
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand2 b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/hand2
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_side b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/left_side
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/link b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/link
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/link
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/move b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/move
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/move
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pencil b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pencil
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pirate b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/pirate
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/plus b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/plus
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_side b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/right_side
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/tcross b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/tcross
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_side b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/top_side
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/watch b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/watch
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/index.theme b/debian/_base/metapackages/redmond-default-settings-ii/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/cursors/index.theme
+++ b/debian/_base/metapackages/redmond-default-settings-ii/cursors/index.theme
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/compat b/debian/_base/metapackages/redmond-default-settings-ii/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/compat
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
index 0995fbb9f..21dbced1b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
@@ -2,7 +2,7 @@ Source: redmond-default-settings-ii-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
Standards-Version: 3.8.4
Package: redmond-default-settings-ii-trinity
@@ -61,7 +61,6 @@ Depends: crystalcursors,
twin-style-crystal-trinity,
lftp,
libarts1-akode-trinity,
- libgl1-mesa-glx,libglut3 | freeglut3,
libtqt-perl,
libsasl2-modules,
openprinting-ppds,
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/.gitignore b/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/.gitignore
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/default-icon-positions/IconPositions b/debian/_base/metapackages/redmond-default-settings-ii/default-icon-positions/IconPositions
index 2f8e237b1..2f8e237b1 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/default-icon-positions/IconPositions
+++ b/debian/_base/metapackages/redmond-default-settings-ii/default-icon-positions/IconPositions
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100755
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index d8777eae9..d8777eae9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
index e25e89fd4..e25e89fd4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
+++ b/debian/_base/metapackages/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi b/debian/_base/metapackages/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi
+++ b/debian/_base/metapackages/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen.svg b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen128.png b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen128.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen128.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen64.png b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kaffeine/fileopen64.png
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/fileopen64.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1 b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-home b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-home
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-home
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-media b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/directory-media
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/directory-media
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/hidden-media b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-hidden/hidden-media
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-hidden/hidden-media
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_managerrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_managerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_managerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_notifierrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/adept_notifierrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/adept_notifierrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/amarokrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/amarokrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/amarokrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/arkrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/arkrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/arkrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc
index 60167c5dd..60167c5dd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/cryptodefaults b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/cryptodefaults
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/cryptodefaults
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/d3lphinrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/d3lphinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/d3lphinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc
index a8c3bb15b..a8c3bb15b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc-2.0 b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0
index ed38dfa2d..ed38dfa2d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/gtkrc-2.0
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3b.eventsrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3b.eventsrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3brc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/k3brc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/k3brc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kaffeinerc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kaffeinerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kaffeinerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katapultrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katapultrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katapultrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katerc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/katerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/katerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kbookmarkrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kbookmarkrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kbookmarkrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcminputrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmlaptoprc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmlaptoprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmnspluginrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
index a44667033..a44667033 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcmnspluginrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcookiejarrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kcookiejarrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kcookiejarrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdeglobals b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdeglobals
index 250274182..250274182 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdesktoprc
index 7534ece0e..7534ece0e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kgpgrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kgpgrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kgpgrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/khelpcenterrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/khelpcenterrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/khelpcenterrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kickerrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kickerrc
index 5ca07ccbc..5ca07ccbc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/klipperrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/klipperrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/klipperrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmailrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmailrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmailrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmixrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmixrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmixrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmplayerrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kmplayerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kmplayerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knemorc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knemorc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knemorc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotesrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotesrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotesrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotify.eventsrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/knotify.eventsrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konqiconviewrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konqiconviewrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konqiconviewrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konquerorrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konsolerc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konsolerc
index 9a30085cc..9a30085cc 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konsolerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konsolerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kontactrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kontactrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kontactrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konversationrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/konversationrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/konversationrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kopeterc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kopeterc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kopeterc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/korgacrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/korgacrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/korgacrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kscdrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kscdrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kscdrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ksplashrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ksplashrc
index 80b4ea864..80b4ea864 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ksplashrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ksplashrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktaskbarrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktaskbarrc
index cc6c1d8bf..cc6c1d8bf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktaskbarrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktaskbarrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktiprc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/ktiprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/ktiprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuriikwsfilterrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuriikwsfilterrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuserrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kuserrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/kuserrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc
index 194732832..194732832 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/metabarrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/metabarrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/metabarrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/profilerc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/profilerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/profilerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/skimrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/skimrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/skimrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/startupconfig b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/startupconfig
index abd9ea20e..abd9ea20e 100755
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/startupconfig
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/startupconfig
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/systemtray_panelappletrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc
index ccf383453..ccf383453 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/systemtray_panelappletrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc
index 8d1c8b69c..8d1c8b69c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdehtmlrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdehtmlrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdeio_httprc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdeio_httprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdelaunchrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdelaunchrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdewalletrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/tdewalletrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/tdewalletrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twincrystalrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twincrystalrc
index e86bdc2e0..e86bdc2e0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twincrystalrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twincrystalrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twinrc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twinrc
index e5690cb5b..e5690cb5b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/twinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/twinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/uiserver b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/uiserver
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/uiserver
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/yakuakerc b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/yakuakerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde-rc-files/yakuakerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/colors b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/colors
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-home b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-home
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-home
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-media b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/directory-media
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/directory-media
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/hidden-media b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-hidden/hidden-media
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-hidden/hidden-media
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/cryptodefaults b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/cryptodefaults
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/dolphinrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/dolphinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/katerc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/katerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/katerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcminputrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
index dcb6cd6ac..dcb6cd6ac 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kdeglobals b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kmixrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kmixrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/ktiprc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/ktiprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kuserrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kuserrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kwinrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdewalletrc b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kde4/kde-rc-files/tdewalletrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/keyboard-rc-files/win-key.sh b/debian/_base/metapackages/redmond-default-settings-ii/keyboard-rc-files/win-key.sh
index d28fa8be7..d28fa8be7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/keyboard-rc-files/win-key.sh
+++ b/debian/_base/metapackages/redmond-default-settings-ii/keyboard-rc-files/win-key.sh
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kickerrc b/debian/_base/metapackages/redmond-default-settings-ii/kickerrc
index 2bf2fd34b..2bf2fd34b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/konqueror-profile/konq_plugins.xml b/debian/_base/metapackages/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/konqueror-profile/konq_plugins.xml
+++ b/debian/_base/metapackages/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-plugins/dirfilterplugin.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-plugins/dirfilterplugin.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/gvimagepart.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/gvimagepart.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ksvgplugin.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/ksvgplugin.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/part.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/part.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/part.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-7z.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-7z.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-7z.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-ace.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-ace.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-ace.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arc.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arc.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arc.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-archive.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-archive.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-archive.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arj.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-arj.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-arj.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip2.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-bzip2.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-bzip2.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-compress.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-compress.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-compress.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-cpio.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-cpio.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-cpio.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-gzip.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-gzip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-gzip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lha.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lha.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lha.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lzop.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-lzop.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-lzop.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-pak.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-pak.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-pak.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-rar.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-rar.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-rar.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tar.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tar.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tar.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tarz.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tarz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tarz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tbz.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tbz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tbz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tgz.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tgz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tgz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tzo.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-tzo.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-tzo.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zip.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zoo.desktop b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/mimelnk/x-zoo.desktop
+++ b/debian/_base/metapackages/redmond-default-settings-ii/mimelnk/x-zoo.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/kstylerc b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/kstylerc
index 4d1d76779..4d1d76779 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/kstylerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/kstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/lipstikstylerc b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/lipstikstylerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/lipstikstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/polyesterstylerc b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/qt-rc-files/polyesterstylerc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/qt-rc-files/polyesterstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/kde4rc b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/kde4rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/kde4rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tde-user-profile b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tde-user-profile
+++ b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tde-user-profile
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tderc b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tderc
index 2b0f2b913..2b0f2b913 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tde-profile/tderc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/tde-profile/tderc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl b/debian/_base/metapackages/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl
+++ b/debian/_base/metapackages/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdmdistrc b/debian/_base/metapackages/redmond-default-settings-ii/tdmdistrc
index 4b0721fd3..4b0721fd3 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/tdmdistrc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/tdmdistrc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/gwenviewui.rc b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/gwenviewui.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/konqueror.rc b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/konqueror.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/konqueror.rc
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/kopetechatwindow.rc b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/distrospecific/ui-rc-files/kopetechatwindow.rc
+++ b/debian/_base/metapackages/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/Makefile b/debian/_base/metapackages/redmond-default-settings/Makefile
index a83a8de3f..a83a8de3f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/Makefile
+++ b/debian/_base/metapackages/redmond-default-settings/Makefile
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/debian/_base/metapackages/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/background.png b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/background.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/head.png b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/head.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/head.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/amarok/stylesheet.css
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz b/debian/_base/metapackages/redmond-default-settings/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/edgyWallpaper.tar.gz
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/enterprise-desktop.png b/debian/_base/metapackages/redmond-default-settings/artwork/enterprise-desktop.png
index 4b1f883f4..4b1f883f4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/enterprise-desktop.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/enterprise-desktop.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
index 4035e27f7..4035e27f7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
index a57917b8f..a57917b8f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
index e1a2648ef..e1a2648ef 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
index 7ed5de679..7ed5de679 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
index c1c8ed284..c1c8ed284 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
index 052defc97..052defc97 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
index 79c19f6aa..79c19f6aa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
index 62a48fd3c..62a48fd3c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
index f69fd57b3..f69fd57b3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
index 18efbfac8..18efbfac8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
index 3b7723190..3b7723190 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
index 439b94c30..439b94c30 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
index 4eb7120af..4eb7120af 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
index 911dfe880..911dfe880 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
index 70a2419bf..70a2419bf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
index 29fe66b86..29fe66b86 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
index c24c5f25a..c24c5f25a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
index 5d5cd8f7a..5d5cd8f7a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
index f379812ae..f379812ae 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
index d877af31f..d877af31f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
index 457eb7c30..457eb7c30 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
index e178dbc96..e178dbc96 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
index 4e6ba5f0d..4e6ba5f0d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
index 6eb18effe..6eb18effe 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg
index 7a598f8fa..7a598f8fa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
index 21f1db0a9..21f1db0a9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg
index 3f775c120..3f775c120 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg
index 127636b9c..127636b9c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
index 535b5a960..535b5a960 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
index 6a96381e8..6a96381e8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
index 7e3b5c237..7e3b5c237 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
index 3cbc9d021..3cbc9d021 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
index 66d8724a9..66d8724a9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
index 1553e7ede..1553e7ede 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
index 05707f46b..05707f46b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
index 0eeb356d1..0eeb356d1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
index 53dfbe91b..53dfbe91b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
index 9ae3f39bd..9ae3f39bd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
index 4bb9e4776..4bb9e4776 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
index 2f625a0d5..2f625a0d5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
index b38ee6b2a..b38ee6b2a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
index 480dfacfc..480dfacfc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
index 651c1dfc5..651c1dfc5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
index 2815769b7..2815769b7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
index dd11781b1..dd11781b1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
index f2d724ef7..f2d724ef7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
index 4e67b2a90..4e67b2a90 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
index 07337d9d5..07337d9d5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
index 699fc1e92..699fc1e92 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
index 0f82327b5..0f82327b5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
index 7300ba787..7300ba787 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
index b3227967a..b3227967a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
index 46d47ff57..46d47ff57 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
index 08c0d35ce..08c0d35ce 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
index e8834b503..e8834b503 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
index 99b6d84d7..99b6d84d7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
index bcfeb457c..bcfeb457c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
index cd3b16311..cd3b16311 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
index e3bc89bd9..e3bc89bd9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
index 81cac6f6d..81cac6f6d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
index 12ecd19df..12ecd19df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
index 1bf5576c1..1bf5576c1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
index d4a8a695a..d4a8a695a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
index af08bfd29..af08bfd29 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
index 7cbaf7f39..7cbaf7f39 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
index 30234263f..30234263f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
index 631b5297b..631b5297b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
index a0e458ce3..a0e458ce3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
index 25c677bbd..25c677bbd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
index a1fa8d5bb..a1fa8d5bb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
index 701db348c..701db348c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
index dd8319f19..dd8319f19 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
index 00fe97041..00fe97041 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
index 9fc47822e..9fc47822e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
index e3d0db71e..e3d0db71e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
index bb4e1fa6a..bb4e1fa6a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
index e2dbb6eb9..e2dbb6eb9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
index 516440ff0..516440ff0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
index c80e146fc..c80e146fc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
index 2d770f592..2d770f592 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
index 59c3fc3ab..59c3fc3ab 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
index c10cddd17..c10cddd17 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
index c1dda4800..c1dda4800 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
index 6d1986090..6d1986090 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
index 454750639..454750639 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
index 75bf53846..75bf53846 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
index 47ead04aa..47ead04aa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
index bb1253f3f..bb1253f3f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
index aea4f9fc8..aea4f9fc8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
index 404004c19..404004c19 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
index 0f7d98144..0f7d98144 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
index 37d0f2015..37d0f2015 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
index a8a1ec58f..a8a1ec58f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
index 7b1673249..7b1673249 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
index eeafc3e93..eeafc3e93 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
index dc835d4d3..dc835d4d3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
index 1f46d48b7..1f46d48b7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
index d2322d955..d2322d955 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
index b08244f2d..b08244f2d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
index 7cec0df71..7cec0df71 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
index bf2d55534..bf2d55534 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
index f4e905f77..f4e905f77 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
index a6cc84cd2..a6cc84cd2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
index 8bb7904c6..8bb7904c6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
index 6b92df4c9..6b92df4c9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
index 295544140..295544140 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
index 6296ebb49..6296ebb49 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
index cfd571d31..cfd571d31 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/index.desktop b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/index.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/index.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_admin.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_away.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_away.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_away.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_halfop.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_op.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_op.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_op.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_owner.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/konversation/irc_voice.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Preview.png b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Preview.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/ReadMe.txt
index 3c7d9763d..3c7d9763d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/ReadMe.txt
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Theme.rc
index d0bd905c5..d0bd905c5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/Theme.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/ksplash/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-kmenu-side.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-konqueror-background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-login.ogg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg
index c24aead02..c24aead02 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-lucid-wallpaper.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-panel.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-panel.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-panel.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg
index e62d362e3..e62d362e3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper-alternate.jpg
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop
index 3f755fe75..3f755fe75 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/background.png b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/background.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/background.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/default.css b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/default.css
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/default.css
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/head.png b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/head.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/head.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/layout.html b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/metabar/layout.html
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/metabar/layout.html
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_over.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/enter_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml
index 5f0fb8bf6..5f0fb8bf6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/kubuntu.xml
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/preview.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_over.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme-no-userlist/system_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/Dialog.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/enter_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/gpl.txt
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/kubuntu.xml b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/kubuntu.xml
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/kubuntu.xml
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/preview.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_normal.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_over.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/tdm-theme/system_pressed.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/16x16/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/22x22/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/32x32/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/48x48/trinity.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/gear.3ds b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/throbber/gear.3ds
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/throbber/gear.3ds
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png b/debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient-inactive.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png b/debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png
+++ b/debian/_base/metapackages/redmond-default-settings/artwork/window-decoration-gradient.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/backgroundrc b/debian/_base/metapackages/redmond-default-settings/backgroundrc
index b259365fc..b259365fc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/backgroundrc
+++ b/debian/_base/metapackages/redmond-default-settings/backgroundrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc b/debian/_base/metapackages/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc
index e4ed11dd7..e4ed11dd7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc
+++ b/debian/_base/metapackages/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/circle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/copy
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/crosshair
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dot
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/dotbox
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_large
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draft_small
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/draped_box
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/fleur
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand1
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2 b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/hand2
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/left_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/link
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/move
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pencil
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/pirate
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/plus
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/right_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/tcross
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/top_side
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/watch
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/index.theme b/debian/_base/metapackages/redmond-default-settings/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/cursors/index.theme
+++ b/debian/_base/metapackages/redmond-default-settings/cursors/index.theme
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/compat b/debian/_base/metapackages/redmond-default-settings/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/compat
+++ b/debian/_base/metapackages/redmond-default-settings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index e5cd8938c..a857d4a82 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -2,7 +2,7 @@ Source: redmond-default-settings-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
Standards-Version: 3.8.4
Package: redmond-default-settings-trinity
@@ -61,7 +61,6 @@ Depends: crystalcursors,
twin-style-crystal-trinity,
lftp,
libarts1-akode-trinity,
- libgl1-mesa-glx,libglut3 | freeglut3,
libtqt-perl,
libsasl2-modules,
openprinting-ppds,
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/.gitignore b/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/.gitignore
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/default-icon-positions/IconPositions b/debian/_base/metapackages/redmond-default-settings/default-icon-positions/IconPositions
index 2f8e237b1..2f8e237b1 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/default-icon-positions/IconPositions
+++ b/debian/_base/metapackages/redmond-default-settings/default-icon-positions/IconPositions
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100755
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index d8777eae9..d8777eae9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
index e25e89fd4..e25e89fd4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
+++ b/debian/_base/metapackages/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi b/debian/_base/metapackages/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi
+++ b/debian/_base/metapackages/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen.svg b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen128.png b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen128.png
+++ b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen128.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen64.png b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kaffeine/fileopen64.png
+++ b/debian/_base/metapackages/redmond-default-settings/kaffeine/fileopen64.png
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1 b/debian/_base/metapackages/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/metapackages/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-home b/debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-home
+++ b/debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-home
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-media b/debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/directory-media
+++ b/debian/_base/metapackages/redmond-default-settings/kde-hidden/directory-media
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/hidden-media b/debian/_base/metapackages/redmond-default-settings/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-hidden/hidden-media
+++ b/debian/_base/metapackages/redmond-default-settings/kde-hidden/hidden-media
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_managerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/adept_notifierrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/amarokrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/amarokrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/amarokrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/arkrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/arkrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/arkrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
index 60167c5dd..60167c5dd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/cryptodefaults
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/d3lphinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc
index a8c3bb15b..a8c3bb15b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0 b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc-2.0
index ed38dfa2d..ed38dfa2d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/gtkrc-2.0
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3b.eventsrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3brc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/k3brc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/k3brc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kaffeinerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katapultrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katapultrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/katapultrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katerc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/katerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/katerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kbookmarkrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcminputrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmlaptoprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmnspluginrc
index a44667033..a44667033 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcmnspluginrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kcookiejarrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdeglobals b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdeglobals
index 820ddf718..820ddf718 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdesktoprc
index e64b7ef97..e64b7ef97 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kdesktoprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kgpgrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kgpgrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kgpgrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/khelpcenterrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kickerrc
index a658c042d..a658c042d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/klipperrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/klipperrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/klipperrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmailrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmailrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmailrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmixrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmixrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmixrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kmplayerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knemorc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knemorc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knemorc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotesrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotesrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotesrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/knotify.eventsrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konqiconviewrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konquerorrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konquerorrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konquerorrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konsolerc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konsolerc
index 9a30085cc..9a30085cc 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konsolerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konsolerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kontactrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kontactrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kontactrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konversationrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/konversationrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/konversationrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kopeterc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kopeterc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kopeterc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/korgacrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/korgacrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/korgacrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kscdrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kscdrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kscdrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ksplashrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ksplashrc
index 80b4ea864..80b4ea864 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ksplashrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ksplashrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktaskbarrc
index 6a2734810..6a2734810 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktaskbarrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktiprc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/ktiprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/ktiprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuriikwsfilterrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuserrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/kuserrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/kuserrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
index 194732832..194732832 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/metabarrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/metabarrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/metabarrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/profilerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/skimrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/skimrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/skimrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/startupconfig b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/startupconfig
index abd9ea20e..abd9ea20e 100755
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/startupconfig
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/startupconfig
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc
index 8d1c8b69c..8d1c8b69c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_panelapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
index e3689c115..e3689c115 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdehtmlrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdeio_httprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdelaunchrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/tdewalletrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/twincrystalrc
index e86bdc2e0..e86bdc2e0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/twincrystalrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/twinrc
index c8f1bcf6a..c8f1bcf6a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/twinrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/twinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/uiserver b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/uiserver
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/uiserver
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/yakuakerc b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde-rc-files/yakuakerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde-rc-files/yakuakerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/colors
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-home
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/directory-media
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-hidden/hidden-media
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/cryptodefaults
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/dolphinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/katerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcminputrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
index dcb6cd6ac..dcb6cd6ac 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kdeglobals
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kmixrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/ktiprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kuserrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/kwinrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc
+++ b/debian/_base/metapackages/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kickerrc b/debian/_base/metapackages/redmond-default-settings/kickerrc
index 2bf2fd34b..2bf2fd34b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kickerrc
+++ b/debian/_base/metapackages/redmond-default-settings/kickerrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
+++ b/debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/compton-tde.conf
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/debian/_base/metapackages/redmond-default-settings/kompmgr-rc-files/xcompmgrrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml b/debian/_base/metapackages/redmond-default-settings/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml
+++ b/debian/_base/metapackages/redmond-default-settings/konqueror-profile/konq_plugins.xml
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc b/debian/_base/metapackages/redmond-default-settings/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-plugins/dirfilterplugin.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/gvimagepart.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/ksvgplugin.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/part.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/part.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/part.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc
+++ b/debian/_base/metapackages/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-7z.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-7z.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-7z.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-ace.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-ace.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-ace.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arc.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arc.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-arc.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-archive.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-archive.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-archive.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arj.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-arj.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-arj.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-bzip2.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-compress.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-compress.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-compress.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-cpio.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-gzip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lha.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lha.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-lha.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-lzop.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-pak.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-pak.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-pak.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-rar.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-rar.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-rar.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tar.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tar.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tar.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tarz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tbz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tgz.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-tzo.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zip.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zip.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-zip.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop
+++ b/debian/_base/metapackages/redmond-default-settings/mimelnk/x-zoo.desktop
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/kstylerc b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/kstylerc
index 6c639810f..6c639810f 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/kstylerc
+++ b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/kstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc
+++ b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/lipstikstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc
+++ b/debian/_base/metapackages/redmond-default-settings/qt-rc-files/polyesterstylerc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/kde4rc b/debian/_base/metapackages/redmond-default-settings/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/kde4rc
+++ b/debian/_base/metapackages/redmond-default-settings/tde-profile/kde4rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tde-user-profile b/debian/_base/metapackages/redmond-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tde-user-profile
+++ b/debian/_base/metapackages/redmond-default-settings/tde-profile/tde-user-profile
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tderc b/debian/_base/metapackages/redmond-default-settings/tde-profile/tderc
index 2b0f2b913..2b0f2b913 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tde-profile/tderc
+++ b/debian/_base/metapackages/redmond-default-settings/tde-profile/tderc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl b/debian/_base/metapackages/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl
+++ b/debian/_base/metapackages/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl
Binary files differ
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdmdistrc b/debian/_base/metapackages/redmond-default-settings/tdmdistrc
index f239e7c98..f239e7c98 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/tdmdistrc
+++ b/debian/_base/metapackages/redmond-default-settings/tdmdistrc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc
+++ b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/gwenviewui.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc
+++ b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/konqueror.rc
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc
+++ b/debian/_base/metapackages/redmond-default-settings/ui-rc-files/kopetechatwindow.rc
diff --git a/debian/_base/metapackages/sudo-trinity/debian/compat b/debian/_base/metapackages/sudo-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/sudo-trinity/debian/compat
+++ b/debian/_base/metapackages/sudo-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/sudo-trinity/debian/control b/debian/_base/metapackages/sudo-trinity/debian/control
index c36b27fa3..6e2268706 100644
--- a/debian/_base/metapackages/sudo-trinity/debian/control
+++ b/debian/_base/metapackages/sudo-trinity/debian/control
@@ -2,7 +2,7 @@ Source: sudo-trinity
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
Standards-Version: 3.8.4
Package: sudo-trinity
diff --git a/debian/_base/metapackages/synaptic-trinity/debian/compat b/debian/_base/metapackages/synaptic-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/synaptic-trinity/debian/compat
+++ b/debian/_base/metapackages/synaptic-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/synaptic-trinity/debian/control b/debian/_base/metapackages/synaptic-trinity/debian/control
index 14cb640ca..192727960 100644
--- a/debian/_base/metapackages/synaptic-trinity/debian/control
+++ b/debian/_base/metapackages/synaptic-trinity/debian/control
@@ -2,7 +2,7 @@ Source: synaptic-trinity
Section: misc
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
Standards-Version: 3.8.4
Package: synaptic-trinity
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/compat b/debian/_base/metapackages/trinity-apt-archive/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/trinity-apt-archive/debian/compat
+++ b/debian/_base/metapackages/trinity-apt-archive/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/control b/debian/_base/metapackages/trinity-apt-archive/debian/control
index 1586bbf1c..ad303adae 100644
--- a/debian/_base/metapackages/trinity-apt-archive/debian/control
+++ b/debian/_base/metapackages/trinity-apt-archive/debian/control
@@ -2,12 +2,12 @@ Source: trinity-apt-archive
Section: misc
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
+Build-Depends: debhelper (>= 10~), cdbs
Standards-Version: 3.8.4
Package: trinity-apt-archive
Priority: optional
-Architecture: all
+Architecture: any
Depends: apt
Pre-Depends: trinity-keyring
Description: APT sources list for the Trinity Desktop Environment repository
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
index 9c02dd904..fda8f69a7 100644
--- a/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
+++ b/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
@@ -1,4 +1,4 @@
# Trinity repositories
-deb http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
-deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
+deb [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
+deb-src [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/rules b/debian/_base/metapackages/trinity-apt-archive/debian/rules
index ccd4e20a8..063ee8468 100755
--- a/debian/_base/metapackages/trinity-apt-archive/debian/rules
+++ b/debian/_base/metapackages/trinity-apt-archive/debian/rules
@@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
+ARCHITECTURE := $(shell dpkg-architecture -qDEB_HOST_ARCH)
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -33,4 +34,4 @@ clean::
binary-install/trinity-apt-archive::
dh_testdir
- sed -i 's|^\(deb[^ ]* [^ ]*\) [^ ]* main|\1 ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list
+ sed -i -e 's|<distribution>|${DISTRIBUTION}|' -e 's|<arch>|${ARCHITECTURE}|' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list
diff --git a/debian/_base/metapackages/trinity-keyring/debian/compat b/debian/_base/metapackages/trinity-keyring/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/trinity-keyring/debian/compat
+++ b/debian/_base/metapackages/trinity-keyring/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/trinity-keyring/debian/control b/debian/_base/metapackages/trinity-keyring/debian/control
index 558dfa587..fb190b8ea 100644
--- a/debian/_base/metapackages/trinity-keyring/debian/control
+++ b/debian/_base/metapackages/trinity-keyring/debian/control
@@ -2,7 +2,7 @@ Source: trinity-keyring
Section: misc
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs, gnupg
+Build-Depends: debhelper (>= 10~), cdbs, gnupg
Standards-Version: 3.8.4
Package: trinity-keyring
diff --git a/debian/_base/metapackages/trinity-slax/debian/compat b/debian/_base/metapackages/trinity-slax/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/metapackages/trinity-slax/debian/compat
+++ b/debian/_base/metapackages/trinity-slax/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/metapackages/trinity-slax/debian/control b/debian/_base/metapackages/trinity-slax/debian/control
index 27ef1d8d1..ea1fec2cd 100644
--- a/debian/_base/metapackages/trinity-slax/debian/control
+++ b/debian/_base/metapackages/trinity-slax/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Standards-Version: 3.8.3
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
Package: trinity-slax
Architecture: all