summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/kdbg/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/kdbg/debian/control2
-rw-r--r--ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/kdiff3/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/kdiff3/debian/control2
-rw-r--r--ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/kpicosim/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/kpicosim/debian/control2
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/control2
-rw-r--r--ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/ktechlab/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/ktechlab/debian/control2
-rw-r--r--ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/kxmleditor/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/kxmleditor/debian/control2
-rw-r--r--ubuntu/_base/applications/development/kxmleditor/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/piklab/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/piklab/debian/control2
-rw-r--r--ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/development/tdesvn/debian/compat2
-rw-r--r--ubuntu/_base/applications/development/tdesvn/debian/control2
-rw-r--r--ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/games/knights/debian/compat2
-rw-r--r--ubuntu/_base/applications/games/knights/debian/control2
-rw-r--r--ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/games/tdepacman/debian/compat2
-rw-r--r--ubuntu/_base/applications/games/tdepacman/debian/control2
-rw-r--r--ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/graphics/digikam/debian/compat2
-rw-r--r--ubuntu/_base/applications/graphics/digikam/debian/control2
-rw-r--r--ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat2
-rw-r--r--ubuntu/_base/applications/graphics/gwenview-i18n/debian/control6
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/compat2
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/control10
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base9
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian3
-rw-r--r--ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm554
-rwxr-xr-xubuntu/_base/applications/graphics/gwenview/debian/rules55
-rw-r--r--ubuntu/_base/applications/graphics/ksquirrel/debian/compat2
-rw-r--r--ubuntu/_base/applications/graphics/ksquirrel/debian/control2
-rw-r--r--ubuntu/_base/applications/graphics/ksquirrel/debian/docs2
-rw-r--r--ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.122
-rwxr-xr-xubuntu/_base/applications/graphics/ksquirrel/debian/rules6
-rw-r--r--ubuntu/_base/applications/graphics/ksquirrel/debian/watch6
-rw-r--r--ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/graphics/potracegui/debian/compat2
-rw-r--r--ubuntu/_base/applications/graphics/potracegui/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kasablanca/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kasablanca/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kbiff/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kbiff/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kftpgrabber/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kftpgrabber/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/knmap/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/knmap/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/konversation/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/konversation/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kopete-otr/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kopete-otr/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kshowmail/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kshowmail/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/dirs3
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst14
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm19
-rw-r--r--ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.132
-rw-r--r--ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/ktorrent/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/ktorrent/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kvirc/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kvirc/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install1
-rwxr-xr-xubuntu/_base/applications/internet/kvirc/debian/rules2
-rw-r--r--ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/kvpnc/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/kvpnc/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/smb4k/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/smb4k/debian/control2
-rw-r--r--ubuntu/_base/applications/internet/smb4k/debian/patches/series (renamed from ubuntu/_base/applications/misc/fusion-icon/debian/patches/series)0
-rwxr-xr-xubuntu/_base/applications/internet/smb4k/debian/rules40
-rw-r--r--ubuntu/_base/applications/internet/smb4k/debian/watch6
-rw-r--r--ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/internet/tork/debian/compat2
-rw-r--r--ubuntu/_base/applications/internet/tork/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/bibletime/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/bibletime/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/bibletime/debian/docs1
-rw-r--r--ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/desktop-effects-tde/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/changelog76
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/compat1
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/control21
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/copyright31
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.138
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm359
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/install1
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/links1
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/manpages1
-rw-r--r--ubuntu/_base/applications/misc/fusion-icon/debian/menu2
-rwxr-xr-xubuntu/_base/applications/misc/fusion-icon/debian/rules38
-rw-r--r--ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/kcmldap/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/kcmldap/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/kcmldapcontroller/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/kcmldapmanager/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/kcmldapmanager/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/kerberostray/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/kerberostray/debian/control2
-rw-r--r--ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/misc/krecipes/debian/compat2
-rw-r--r--ubuntu/_base/applications/misc/krecipes/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/codeine/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/codeine/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/codeine/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/k3b-i18n/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES3
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/control16
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files5
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install11
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files3
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install3
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install2
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files3
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install25
-rwxr-xr-xubuntu/_base/applications/multimedia/k3b/debian/rules46
-rw-r--r--ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/k9copy/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/k9copy/debian/control3
-rwxr-xr-xubuntu/_base/applications/multimedia/k9copy/debian/rules37
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/kaffeine/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/kmplayer/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/kmplayer/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/kplayer/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/kplayer/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/kplayer/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/rosegarden/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/rosegarden/debian/control2
-rwxr-xr-xubuntu/_base/applications/multimedia/rosegarden/debian/rules2
-rw-r--r--ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/soundkonverter/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/soundkonverter/debian/control2
-rw-r--r--ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series (renamed from ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/_base/applications/multimedia/soundkonverter/debian/rules45
-rw-r--r--ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install14
-rw-r--r--ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/multimedia/tderadio/debian/compat2
-rw-r--r--ubuntu/_base/applications/multimedia/tderadio/debian/control4
-rw-r--r--ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/basket/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/basket/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/kbibtex/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/kbibtex/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/kbookreader/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/kbookreader/debian/control2
-rw-r--r--ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/keximdb/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/keximdb/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/kile/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/kile/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/control2
-rw-r--r--ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/knowit/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/knowit/debian/control2
-rw-r--r--ubuntu/_base/applications/office/koffice-i18n/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/koffice-i18n/debian/control2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/control4
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian2
-rwxr-xr-xubuntu/_base/applications/office/koffice/debian/rules2
-rw-r--r--ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/kpilot/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/kpilot/debian/control2
-rw-r--r--ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/tellico/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/tellico/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/kdpkg/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/kdpkg/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/kima/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/kima/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/kiosktool/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/kiosktool/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/kkbswitch/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/kkbswitch/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/klcddimmer/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/klcddimmer/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs10
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/install1
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1162
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/manpages1
-rwxr-xr-xubuntu/_base/applications/settings/kmyfirewall/debian/rules1
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/watch2
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian107
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/control17
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs (renamed from ubuntu/_base/applications/settings/tde-guidance/debian/docs)1
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install4
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.169
-rwxr-xr-xubuntu/_base/applications/settings/tde-guidance/debian/rules175
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.169
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs3
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install84
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides2
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst9
-rw-r--r--ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.169
-rw-r--r--ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/tde-systemsettings/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/tde-systemsettings/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst12
-rw-r--r--ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/tdesudo/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/tdesudo/debian/control2
-rw-r--r--ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/wlassistant/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/wlassistant/debian/control2
-rw-r--r--ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/dolphin/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/dolphin/debian/control2
-rw-r--r--ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/katapult/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/katapult/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kbfx/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kbfx/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kbfx/debian/postinst25
-rw-r--r--ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kcmautostart/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kcmautostart/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kdbusnotification/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kdbusnotification/debian/control2
-rw-r--r--ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/klamav/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/klamav/debian/control2
-rw-r--r--ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/knemo/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/knemo/debian/control2
-rw-r--r--ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/knetload/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/knetload/debian/control2
-rw-r--r--ubuntu/_base/applications/system/knetload/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/knetstats/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/knetstats/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kooldock/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kooldock/debian/control2
-rw-r--r--ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/krusader/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/krusader/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kshutdown/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kshutdown/debian/control2
-rw-r--r--ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/ksystemlog/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/ksystemlog/debian/control2
-rw-r--r--ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/kvkbd/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/kvkbd/debian/control2
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/control2
-rw-r--r--ubuntu/_base/applications/system/smartcardauth/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/smartcardauth/debian/control2
-rw-r--r--ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/tastymenu/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/tastymenu/debian/control2
-rw-r--r--ubuntu/_base/applications/system/tastymenu/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/changelog12
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/compat1
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/control76
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/copyright43
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/docs1
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install3
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install2
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install3
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install2
-rwxr-xr-xubuntu/_base/applications/system/tdebluez/debian/rules19
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/source/format (renamed from ubuntu/_base/applications/misc/fusion-icon/debian/source/format)0
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/source/options (renamed from ubuntu/_base/applications/misc/fusion-icon/debian/source/options)0
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install1
-rw-r--r--ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install27
-rw-r--r--ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/tdedocker/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/tdedocker/debian/control2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/control2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst13
-rw-r--r--ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk18
-rw-r--r--ubuntu/_base/applications/system/tdesshaskpass/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/tdesshaskpass/debian/control2
-rw-r--r--ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/yakuake/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/yakuake/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-apt/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-locate/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-sword/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/gtk-qt-engine/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/kgtk-qt3/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/kgtk-qt3/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian6
-rw-r--r--ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tde-style-domino/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-domino/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series1
-rw-r--r--ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-lipstik/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog125
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/compat1
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/control15
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright16
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/docs2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series (renamed from ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/_base/applications/themes/tde-style-polyester/debian/rules17
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format1
-rw-r--r--ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options6
-rw-r--r--ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/tdmtheme/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/tdmtheme/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/twin-style-crystal/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-crystal/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-dekorator/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog5
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat1
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control12
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright8
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1)0
-rwxr-xr-xubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules17
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format1
-rw-r--r--ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options6
-rw-r--r--ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-machbunt/debian/control2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/themes/twin-style-suse2/debian/compat2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-suse2/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/abakus/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/abakus/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/filelight/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/filelight/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/kbarcode/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/kbarcode/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/kchmviewer/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/kchmviewer/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/kcpuload/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/kcpuload/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/kdirstat/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/kdirstat/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/keep/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/keep/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/knutclient/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/knutclient/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/changelog67
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/compat1
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/control15
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/copyright39
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/docs3
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/utilities/kommando/debian/rules17
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/source/format1
-rw-r--r--ubuntu/_base/applications/utilities/kommando/debian/source/options6
-rw-r--r--ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/kompose/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/kompose/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/krename/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/krename/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/ksensors/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/ksensors/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/mathemagics/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/mathemagics/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/utilities/qalculate-tde/debian/compat2
-rw-r--r--ubuntu/_base/applications/utilities/qalculate-tde/debian/control2
-rw-r--r--ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series1
-rw-r--r--ubuntu/_base/core/tde-i18n/debian/compat2
-rw-r--r--ubuntu/_base/core/tde-i18n/debian/control4
-rw-r--r--ubuntu/_base/core/tde-i18n/debian/control-lang2
-rw-r--r--ubuntu/_base/core/tde-i18n/debian/control-source2
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeaccessibility/debian/control2
-rw-r--r--ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeaddons/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeaddons/debian/control2
-rw-r--r--ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian3
-rw-r--r--ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeadmin/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeadmin/debian/control2
-rw-r--r--ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeartwork/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeartwork/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdebase/debian/compat2
-rw-r--r--ubuntu/_base/core/tdebase/debian/control3
-rw-r--r--ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install4
-rw-r--r--ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst3
-rw-r--r--ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian1
-rw-r--r--ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst3
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff13
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff2
-rwxr-xr-xubuntu/_base/core/tdebase/debian/rules4
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install6
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install4
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm2
-rw-r--r--ubuntu/_base/core/tdebase/debian/twin-trinity.install39
-rw-r--r--ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdebindings/debian/compat2
-rw-r--r--ubuntu/_base/core/tdebindings/debian/control4
-rwxr-xr-xubuntu/_base/core/tdebindings/debian/rules2
-rw-r--r--ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeedu/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeedu/debian/control2
-rw-r--r--ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdegames/debian/compat2
-rw-r--r--ubuntu/_base/core/tdegames/debian/control2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/compat2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/control2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdelibs/debian/compat2
-rw-r--r--ubuntu/_base/core/tdelibs/debian/control4
-rwxr-xr-xubuntu/_base/core/tdelibs/debian/rules45
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install1
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst1
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm1
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/compat2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/control2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install27
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/compat2
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/control2
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install7
-rw-r--r--ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdepim/debian/compat2
-rw-r--r--ubuntu/_base/core/tdepim/debian/control4
-rwxr-xr-xubuntu/_base/core/tdepim/debian/rules58
-rw-r--r--ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdesdk/debian/compat2
-rw-r--r--ubuntu/_base/core/tdesdk/debian/control2
-rw-r--r--ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdetoys/debian/compat2
-rw-r--r--ubuntu/_base/core/tdetoys/debian/control2
-rw-r--r--ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeutils/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/control2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdevelop/debian/compat2
-rw-r--r--ubuntu/_base/core/tdevelop/debian/control2
-rw-r--r--ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdewebdev/debian/compat2
-rw-r--r--ubuntu/_base/core/tdewebdev/debian/control2
-rw-r--r--ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/akode/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/akode/debian/control2
-rw-r--r--ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/arts/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/arts/debian/control4
-rwxr-xr-xubuntu/_base/dependencies/arts/debian/rules51
-rw-r--r--ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/avahi-tqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/avahi-tqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/dbus-1-tqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/dbus-1-tqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/dbus-tqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/dbus-tqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/libart-lgpl/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/libart-lgpl/debian/control2
-rw-r--r--ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/libcaldav/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/libcaldav/debian/control2
-rwxr-xr-xubuntu/_base/dependencies/libcaldav/debian/rules44
-rw-r--r--ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/libcarddav/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/libcarddav/debian/control2
-rwxr-xr-xubuntu/_base/dependencies/libcarddav/debian/rules44
-rw-r--r--ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/libr/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/libr/debian/control6
-rw-r--r--ubuntu/_base/dependencies/libr/debian/libr1.dirs (renamed from ubuntu/_base/dependencies/libr/debian/libr0.dirs)0
-rw-r--r--ubuntu/_base/dependencies/libr/debian/libr1.install (renamed from ubuntu/_base/dependencies/libr/debian/libr0.install)0
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1 (renamed from ubuntu/_base/dependencies/pytqt/debian/manpages/pylupdate.1)22
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1 (renamed from ubuntu/_base/dependencies/pytqt/debian/manpages/pyuic.1)22
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install14
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides22
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install2
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages4
-rw-r--r--ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py17
-rwxr-xr-xubuntu/_base/dependencies/pytqt/debian/rules15
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/control2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/patches/series2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff32
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff18
-rwxr-xr-xubuntu/_base/dependencies/sip4-tqt/debian/rules10
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py4
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/tde-cmake/debian/control2
-rw-r--r--ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/tqca/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/tqca/debian/control2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/control2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/README.Debian20
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/control48
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install3
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install48
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs3
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs3
-rwxr-xr-xubuntu/_base/dependencies/tqt3/debian/rules44
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install6
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links6
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install1
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs1
-rw-r--r--ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/dependencies/tqtinterface/debian/compat2
-rw-r--r--ubuntu/_base/dependencies/tqtinterface/debian/control2
-rw-r--r--ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/libraries/kipi-plugins/debian/compat2
-rw-r--r--ubuntu/_base/libraries/kipi-plugins/debian/control2
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/control2
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/control2
-rw-r--r--ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/libraries/libkipi/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libkipi/debian/control2
-rw-r--r--ubuntu/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/libraries/libksquirrel/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/libraries/libksquirrel/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libksquirrel/debian/control10
-rw-r--r--ubuntu/_base/libraries/libksquirrel/debian/patches/series0
-rwxr-xr-xubuntu/_base/libraries/libksquirrel/debian/rules123
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/control2
-rw-r--r--ubuntu/_base/libraries/libtqt-perl/debian/compat2
-rw-r--r--ubuntu/_base/libraries/libtqt-perl/debian/control2
-rw-r--r--ubuntu/_base/libraries/pytde/debian/compat2
-rw-r--r--ubuntu/_base/libraries/pytde/debian/control2
-rw-r--r--ubuntu/_base/libraries/pytde/debian/pytdeconfig.py8
-rwxr-xr-xubuntu/_base/libraries/pytde/debian/rules2
-rw-r--r--ubuntu/_base/libraries/pytdeextensions/debian/compat2
-rw-r--r--ubuntu/_base/libraries/pytdeextensions/debian/control2
-rw-r--r--ubuntu/_base/metapackages/casper-trinity/debian/compat2
-rw-r--r--ubuntu/_base/metapackages/casper-trinity/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/Makefile (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/Makefile)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/background.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/background.png)bin78100 -> 78100 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/head.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/head.png)bin170 -> 170 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/stylesheet.css (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz)bin2173935 -> 2173935 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1024x768.jpg)bin114908 -> 114908 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x1024.jpg)bin177029 -> 177029 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x800.jpg)bin149594 -> 149594 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1440x900.jpg)bin183559 -> 183559 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1600x1200.jpg)bin250277 -> 250277 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1080.jpg)bin276478 -> 276478 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1200.jpg)bin299494 -> 299494 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/index.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/index.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_admin.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png)bin755 -> 755 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_away.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_away.png)bin473 -> 473 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_halfop.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png)bin751 -> 751 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png)bin744 -> 744 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_op.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_op.png)bin753 -> 753 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_owner.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png)bin740 -> 740 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_voice.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png)bin744 -> 744 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Dialog.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png)bin58313 -> 58313 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Preview.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Preview.png)bin143500 -> 143500 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/ReadMe.txt (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Theme.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/gpl.txt (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg)bin44757 -> 44757 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg)bin258562 -> 258562 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg)bin299494 -> 299494 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png)bin465 -> 465 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png)bin2843 -> 2843 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png)bin1310 -> 1310 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png)bin27184 -> 27184 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-login.ogg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg)bin32397 -> 32397 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-panel.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-panel.png)bin1373 -> 1373 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png)bin1157493 -> 1157493 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/background.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/background.png)bin78100 -> 78100 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/default.css (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/default.css)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/head.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/head.png)bin170 -> 170 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/layout.html (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/layout.html)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/Dialog.png)bin58297 -> 58297 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/gpl.txt)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/preview.png)bin470224 -> 470224 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/Dialog.png)bin61505 -> 61505 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/gpl.txt)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/kubuntu.xml)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/preview.png)bin470224 -> 470224 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Dialog.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png)bin5098 -> 5098 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Makefile.am (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Makefile.am)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png)bin2422 -> 2422 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png)bin1639 -> 1639 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enterprise.xml)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/gpl.txt (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/preview.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png)bin381843 -> 381843 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_normal.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_over.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png)bin2491 -> 2491 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png)bin1623 -> 1623 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png)bin782 -> 782 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png)bin779 -> 779 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png)bin776 -> 776 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png)bin800 -> 800 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png)bin794 -> 794 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png)bin791 -> 791 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png)bin792 -> 792 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png)bin791 -> 791 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png)bin789 -> 789 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png)bin786 -> 786 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png)bin786 -> 786 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png)bin784 -> 784 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png)bin784 -> 784 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png)bin781 -> 781 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png)bin782 -> 782 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png)bin769 -> 769 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png)bin771 -> 771 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png)bin764 -> 764 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png)bin787 -> 787 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png)bin779 -> 779 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png)bin770 -> 770 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png)bin758 -> 758 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png)bin772 -> 772 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png)bin784 -> 784 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png)bin771 -> 771 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png)bin771 -> 771 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png)bin787 -> 787 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png)bin787 -> 787 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png)bin780 -> 780 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png)bin780 -> 780 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png)bin784 -> 784 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png)bin783 -> 783 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png)bin763 -> 763 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png)bin770 -> 770 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png)bin778 -> 778 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png)bin784 -> 784 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png)bin774 -> 774 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png)bin759 -> 759 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png)bin763 -> 763 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png)bin768 -> 768 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png)bin769 -> 769 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png)bin765 -> 765 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png)bin777 -> 777 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png)bin772 -> 772 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png)bin782 -> 782 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png)bin788 -> 788 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png)bin780 -> 780 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png)bin786 -> 786 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png)bin772 -> 772 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png)bin786 -> 786 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png)bin793 -> 793 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png)bin786 -> 786 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png)bin781 -> 781 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png)bin791 -> 791 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png)bin795 -> 795 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png)bin792 -> 792 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png)bin782 -> 782 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png)bin781 -> 781 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png)bin774 -> 774 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png)bin778 -> 778 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png)bin777 -> 777 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png)bin761 -> 761 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png)bin770 -> 770 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png)bin771 -> 771 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png)bin767 -> 767 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png)bin773 -> 773 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png)bin779 -> 779 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png)bin778 -> 778 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png)bin778 -> 778 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png)bin782 -> 782 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png)bin779 -> 779 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png)bin795 -> 795 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/trinity.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png)bin38288 -> 38288 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png)bin1178 -> 1178 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png)bin1199 -> 1199 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png)bin1188 -> 1188 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png)bin1195 -> 1195 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png)bin1203 -> 1203 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png)bin1198 -> 1198 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png)bin1181 -> 1181 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png)bin1190 -> 1190 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png)bin1182 -> 1182 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png)bin1155 -> 1155 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png)bin1183 -> 1183 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png)bin1189 -> 1189 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png)bin1209 -> 1209 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png)bin1185 -> 1185 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png)bin1179 -> 1179 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png)bin1184 -> 1184 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png)bin1177 -> 1177 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png)bin1169 -> 1169 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png)bin1186 -> 1186 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png)bin1163 -> 1163 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png)bin1163 -> 1163 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png)bin1190 -> 1190 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png)bin1170 -> 1170 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png)bin1187 -> 1187 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png)bin1198 -> 1198 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png)bin1212 -> 1212 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png)bin1203 -> 1203 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png)bin1199 -> 1199 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png)bin1194 -> 1194 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png)bin1198 -> 1198 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png)bin1179 -> 1179 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png)bin1169 -> 1169 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png)bin1165 -> 1165 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png)bin1167 -> 1167 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png)bin1161 -> 1161 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png)bin1165 -> 1165 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png)bin1164 -> 1164 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png)bin1169 -> 1169 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png)bin1161 -> 1161 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png)bin1171 -> 1171 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png)bin1182 -> 1182 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png)bin1186 -> 1186 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png)bin1169 -> 1169 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png)bin1182 -> 1182 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png)bin1198 -> 1198 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png)bin1193 -> 1193 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png)bin1185 -> 1185 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png)bin1177 -> 1177 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png)bin1178 -> 1178 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png)bin1215 -> 1215 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png)bin1196 -> 1196 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png)bin1219 -> 1219 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png)bin1179 -> 1179 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png)bin1200 -> 1200 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png)bin1186 -> 1186 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png)bin1189 -> 1189 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png)bin1176 -> 1176 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png)bin1174 -> 1174 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png)bin1161 -> 1161 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png)bin1191 -> 1191 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png)bin1172 -> 1172 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png)bin1176 -> 1176 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png)bin1176 -> 1176 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png)bin1172 -> 1172 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png)bin1160 -> 1160 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png)bin1164 -> 1164 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png)bin1176 -> 1176 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png)bin1192 -> 1192 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png)bin1173 -> 1173 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png)bin1186 -> 1186 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png)bin1178 -> 1178 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png)bin1170 -> 1170 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/trinity.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png)bin62916 -> 62916 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png)bin1962 -> 1962 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png)bin1957 -> 1957 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png)bin1967 -> 1967 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png)bin1987 -> 1987 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png)bin1980 -> 1980 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png)bin1963 -> 1963 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png)bin1957 -> 1957 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png)bin1990 -> 1990 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png)bin1972 -> 1972 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png)bin1963 -> 1963 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png)bin1968 -> 1968 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png)bin1995 -> 1995 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png)bin1953 -> 1953 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png)bin1996 -> 1996 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png)bin1986 -> 1986 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png)bin1968 -> 1968 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png)bin1966 -> 1966 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png)bin1957 -> 1957 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png)bin1964 -> 1964 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png)bin1971 -> 1971 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png)bin1961 -> 1961 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png)bin1975 -> 1975 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png)bin1946 -> 1946 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png)bin1949 -> 1949 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png)bin1973 -> 1973 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png)bin1980 -> 1980 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png)bin1992 -> 1992 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png)bin1965 -> 1965 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png)bin1959 -> 1959 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png)bin1932 -> 1932 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png)bin1938 -> 1938 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png)bin1921 -> 1921 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png)bin1923 -> 1923 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png)bin1922 -> 1922 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png)bin1912 -> 1912 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png)bin1933 -> 1933 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png)bin1911 -> 1911 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png)bin1942 -> 1942 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png)bin1969 -> 1969 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png)bin1962 -> 1962 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png)bin1952 -> 1952 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png)bin1974 -> 1974 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png)bin1955 -> 1955 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png)bin1973 -> 1973 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png)bin1979 -> 1979 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png)bin1955 -> 1955 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png)bin1976 -> 1976 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png)bin1970 -> 1970 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png)bin1978 -> 1978 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png)bin1977 -> 1977 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png)bin1992 -> 1992 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png)bin1994 -> 1994 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png)bin1977 -> 1977 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png)bin1994 -> 1994 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png)bin1962 -> 1962 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png)bin1985 -> 1985 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png)bin1964 -> 1964 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png)bin1936 -> 1936 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png)bin1935 -> 1935 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png)bin1962 -> 1962 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png)bin1961 -> 1961 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png)bin1965 -> 1965 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png)bin1975 -> 1975 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png)bin1956 -> 1956 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png)bin1962 -> 1962 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png)bin1961 -> 1961 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png)bin1968 -> 1968 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png)bin1952 -> 1952 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png)bin1955 -> 1955 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png)bin1936 -> 1936 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png)bin1943 -> 1943 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png)bin1956 -> 1956 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/trinity.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png)bin108843 -> 108843 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png)bin3068 -> 3068 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png)bin3135 -> 3135 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png)bin3154 -> 3154 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png)bin3200 -> 3200 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png)bin3128 -> 3128 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png)bin3167 -> 3167 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png)bin3158 -> 3158 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png)bin3149 -> 3149 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png)bin3083 -> 3083 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png)bin3069 -> 3069 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png)bin3061 -> 3061 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png)bin3129 -> 3129 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png)bin3089 -> 3089 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png)bin3114 -> 3114 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png)bin3086 -> 3086 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png)bin3077 -> 3077 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png)bin3082 -> 3082 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png)bin3064 -> 3064 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png)bin3084 -> 3084 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png)bin3087 -> 3087 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png)bin3052 -> 3052 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png)bin3091 -> 3091 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png)bin3111 -> 3111 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png)bin3140 -> 3140 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png)bin3138 -> 3138 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png)bin3188 -> 3188 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png)bin3200 -> 3200 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png)bin3144 -> 3144 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png)bin3159 -> 3159 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png)bin3145 -> 3145 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png)bin3157 -> 3157 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png)bin3113 -> 3113 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png)bin3029 -> 3029 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png)bin3026 -> 3026 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png)bin3050 -> 3050 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png)bin3036 -> 3036 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png)bin3053 -> 3053 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png)bin3057 -> 3057 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png)bin3082 -> 3082 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png)bin3099 -> 3099 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png)bin3081 -> 3081 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png)bin3141 -> 3141 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png)bin3139 -> 3139 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png)bin3101 -> 3101 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png)bin3066 -> 3066 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png)bin3095 -> 3095 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png)bin3109 -> 3109 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png)bin3134 -> 3134 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png)bin3160 -> 3160 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png)bin3206 -> 3206 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png)bin3247 -> 3247 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png)bin3211 -> 3211 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png)bin3169 -> 3169 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png)bin3183 -> 3183 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png)bin3172 -> 3172 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png)bin3120 -> 3120 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png)bin3048 -> 3048 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png)bin3038 -> 3038 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png)bin3059 -> 3059 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png)bin3126 -> 3126 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png)bin3115 -> 3115 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png)bin3095 -> 3095 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png)bin3073 -> 3073 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png)bin3096 -> 3096 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png)bin3091 -> 3091 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png)bin3091 -> 3091 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png)bin3079 -> 3079 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png)bin3037 -> 3037 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png)bin3022 -> 3022 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png)bin3001 -> 3001 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png)bin3037 -> 3037 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png)bin3079 -> 3079 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/trinity.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png)bin164940 -> 164940 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/gear.3ds (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/gear.3ds)bin993179 -> 993179 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png)bin196 -> 196 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png)bin322 -> 322 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/backgroundrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/backgroundrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/circle (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/copy (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dot (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2 (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/link (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/move (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/plus (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/watch (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large)bin5248 -> 5248 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/cursors/index.theme (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/index.theme)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore0
-rwxr-xr-xubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde)0
l---------ubuntu/_base/metapackages/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen128.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen128.png)bin7355 -> 7355 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen64.png (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen64.png)bin3305 -> 3305 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.10
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-home (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-home)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-media (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-media)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/hidden-media (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/hidden-media)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_managerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_notifierrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/amarokrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/amarokrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/arkrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/arkrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/cryptodefaults (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/d3lphinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3b.eventsrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3brc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3brc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kaffeinerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katapultrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katapultrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kbookmarkrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcminputrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcminputrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmlaptoprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmnspluginrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcookiejarrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdeglobals (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdeglobals)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdesktoprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kgpgrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kgpgrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/khelpcenterrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kickerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kickerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/klipperrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/klipperrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmailrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmailrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmixrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmixrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmplayerrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knemorc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knemorc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotesrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotesrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotify.eventsrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konqiconviewrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konquerorrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konquerorrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konsolerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konsolerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kontactrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kontactrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konversationrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konversationrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kopeterc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kopeterc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/korgacrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/korgacrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kscdrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kscdrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ksplashrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ksplashrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ktiprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ktiprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuserrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuserrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/metabarrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/metabarrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/profilerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/profilerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/skimrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/skimrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdehtmlrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdeio_httprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdelaunchrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdewalletrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twincrystalrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/uiserver (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/uiserver)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/yakuakerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/yakuakerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/colors (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-home (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-media (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/hidden-media (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/katerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kmixrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/ktiprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kuserrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kwinrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/konqueror-profile/konq_plugins.xml (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/part.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/part.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-7z.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-7z.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-ace.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-ace.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arc.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arc.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-archive.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-archive.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arj.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arj.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip2.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-compress.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-compress.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-cpio.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-gzip.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lha.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lha.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lzop.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-pak.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-pak.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-rar.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-rar.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tar.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tar.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tarz.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tbz.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tgz.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tzo.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zip.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zip.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zoo.desktop (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/kstylerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/kstylerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/lipstikstylerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/polyesterstylerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/qtcurve-rc-files/stylerc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/kde4rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/kde4rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tde-user-profile (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tde-user-profile)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tderc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tderc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl)bin148 -> 148 bytes
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/tdmdistrc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdmdistrc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/gwenviewui.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/konqueror.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc (renamed from ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc)0
-rw-r--r--ubuntu/_base/metapackages/kubuntu-meta/debian/compat2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-meta/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop5
-rw-r--r--ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all2
-rw-r--r--ubuntu/_base/metapackages/trinity-livecd/debian/compat2
-rw-r--r--ubuntu/_base/metapackages/trinity-livecd/debian/control2
-rw-r--r--ubuntu/_base/metapackages/ubiquity-trinity/debian/compat2
-rw-r--r--ubuntu/_base/metapackages/ubiquity-trinity/debian/control2
l---------ubuntu/lunar (renamed from ubuntu/hirsute)0
l---------ubuntu/mantic (renamed from ubuntu/impish)0
l---------ubuntu/noble (renamed from ubuntu/xenial)0
1373 files changed, 4158 insertions, 3417 deletions
diff --git a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/kdbg/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/compat
+++ b/ubuntu/_base/applications/development/kdbg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control
index aa93ac62c..e32f49776 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/kdiff3/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/compat
+++ b/ubuntu/_base/applications/development/kdiff3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control
index 02fe0d8ae..aa979644f 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/kpicosim/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/compat
+++ b/ubuntu/_base/applications/development/kpicosim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control
index 5f5a4f631..51b5d898b 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/kscope/debian/compat b/ubuntu/_base/applications/development/kscope/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kscope/debian/compat
+++ b/ubuntu/_base/applications/development/kscope/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kscope/debian/control b/ubuntu/_base/applications/development/kscope/debian/control
index 34f3900e0..73542706b 100644
--- a/ubuntu/_base/applications/development/kscope/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/ktechlab/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/compat
+++ b/ubuntu/_base/applications/development/ktechlab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control
index 01ca950bd..a36f98051 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/kxmleditor/debian/compat b/ubuntu/_base/applications/development/kxmleditor/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/compat
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/control b/ubuntu/_base/applications/development/kxmleditor/debian/control
index a3d57883a..0047dbbc0 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/development/kxmleditor/debian/patches/series b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/piklab/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/piklab/debian/compat
+++ b/ubuntu/_base/applications/development/piklab/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control
index af567d8cf..502bc13bd 100644
--- a/ubuntu/_base/applications/development/piklab/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/development/tdesvn/debian/compat b/ubuntu/_base/applications/development/tdesvn/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/compat
+++ b/ubuntu/_base/applications/development/tdesvn/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/development/tdesvn/debian/control b/ubuntu/_base/applications/development/tdesvn/debian/control
index e077bd91f..def2cb962 100644
--- a/ubuntu/_base/applications/development/tdesvn/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/games/knights/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/games/knights/debian/compat
+++ b/ubuntu/_base/applications/games/knights/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/games/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control
index fc6aa3cf8..fb1fe9894 100644
--- a/ubuntu/_base/applications/games/knights/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/games/tdepacman/debian/compat b/ubuntu/_base/applications/games/tdepacman/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/compat
+++ b/ubuntu/_base/applications/games/tdepacman/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/control b/ubuntu/_base/applications/games/tdepacman/debian/control
index 1e4f72fb4..2039eefb8 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/digikam/debian/compat b/ubuntu/_base/applications/graphics/digikam/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/compat
+++ b/ubuntu/_base/applications/graphics/digikam/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control
index cf999e44c..f0da4b350 100644
--- a/ubuntu/_base/applications/graphics/digikam/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
index 63923eccc..b292db694 100644
--- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/gwenview/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control
index f5734ed43..632b8aa24 100644
--- a/ubuntu/_base/applications/graphics/gwenview/debian/control
+++ b/ubuntu/_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-kde3 (<< 4:14.0.0~), gwenview-trinity (<< 4:14.0.0~)
Breaks: gwenview-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base
deleted file mode 100644
index 931c8d219..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
deleted file mode 100644
index 0e247a6ab..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
deleted file mode 100644
index 076efa834..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/graphics/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules
index 4f8a32879..f8596e545 100755
--- a/ubuntu/_base/applications/graphics/gwenview/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/ksquirrel/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
index a4c43964e..08c8cdff8 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/ksquirrel/debian/docs b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
index 724e08449..6f12db508 100644
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
@@ -1,2 +1,2 @@
+AUTHORS
README
-TODO
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
deleted file mode 100644
index a6da62b4c..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/graphics/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
index 813fff66f..8f95f25f5 100755
--- a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/ksquirrel/debian/watch b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
deleted file mode 100644
index a276799ff..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/graphics/potracegui/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/compat
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control
index 23c84b62d..b74639fe5 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kasablanca/debian/compat b/ubuntu/_base/applications/internet/kasablanca/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/compat
+++ b/ubuntu/_base/applications/internet/kasablanca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/control b/ubuntu/_base/applications/internet/kasablanca/debian/control
index d7cfd8967..75b562ffe 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kbiff/debian/compat b/ubuntu/_base/applications/internet/kbiff/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/compat
+++ b/ubuntu/_base/applications/internet/kbiff/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control
index 802006f59..6615dd019 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kftpgrabber/debian/compat b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/control b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
index d915549fb..fec3c520e 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/knmap/debian/compat b/ubuntu/_base/applications/internet/knmap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/compat
+++ b/ubuntu/_base/applications/internet/knmap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/knmap/debian/control b/ubuntu/_base/applications/internet/knmap/debian/control
index d7ea1a809..92ca50aa0 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/konversation/debian/compat b/ubuntu/_base/applications/internet/konversation/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/compat
+++ b/ubuntu/_base/applications/internet/konversation/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control
index 0654a8e79..76b4861db 100644
--- a/ubuntu/_base/applications/internet/konversation/debian/control
+++ b/ubuntu/_base/applications/internet/konversation/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: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev, dh-python
+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/
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kopete-otr/debian/compat b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/compat
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/control b/ubuntu/_base/applications/internet/kopete-otr/debian/control
index 7599950cb..69d31c248 100644
--- a/ubuntu/_base/applications/internet/kopete-otr/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kshowmail/debian/compat b/ubuntu/_base/applications/internet/kshowmail/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/compat
+++ b/ubuntu/_base/applications/internet/kshowmail/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/control b/ubuntu/_base/applications/internet/kshowmail/debian/control
index 746ffb5d5..95597c177 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kstreamripper/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/compat
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control
index 7b0807a95..213d9b940 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
deleted file mode 100644
index a59ccc8af..000000000
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/pixmaps
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
deleted file mode 100644
index f5542ab64..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
deleted file mode 100644
index 5209bcb38..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
deleted file mode 100644
index 3129be689..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/ktorrent/debian/compat b/ubuntu/_base/applications/internet/ktorrent/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/compat
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
index 160789e78..b19611be8 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kvirc/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/compat
+++ b/ubuntu/_base/applications/internet/kvirc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control
index 528f85fdc..f1c0488bd 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/control
+++ b/ubuntu/_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, libssl-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/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index 6ba0b5d33..010c6f400 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
@@ -1,6 +1,7 @@
debian/tmp/opt/trinity/bin/kvi_run_netscape
debian/tmp/opt/trinity/bin/kvi_search_help
debian/tmp/opt/trinity/share/applnk/Internet/kvirc.desktop
+debian/tmp/opt/trinity/share/apps/tdeconf_update/
debian/tmp/opt/trinity/share/icons/hicolor/
debian/tmp/opt/trinity/share/kvirc/*/config/
debian/tmp/opt/trinity/share/kvirc/*/defscript/
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules
index 6fc9dffe2..6ca089653 100755
--- a/ubuntu/_base/applications/internet/kvirc/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/kvpnc/debian/compat b/ubuntu/_base/applications/internet/kvpnc/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/compat
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/control b/ubuntu/_base/applications/internet/kvpnc/debian/control
index 95853a6a5..d628ae4bb 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/smb4k/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/smb4k/debian/compat
+++ b/ubuntu/_base/applications/internet/smb4k/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control
index 4f01f0481..38234f9e5 100644
--- a/ubuntu/_base/applications/internet/smb4k/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series b/ubuntu/_base/applications/internet/smb4k/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
+++ b/ubuntu/_base/applications/internet/smb4k/debian/patches/series
diff --git a/ubuntu/_base/applications/internet/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules
index 95e8cd9f1..a6797f19a 100755
--- a/ubuntu/_base/applications/internet/smb4k/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/smb4k/debian/watch b/ubuntu/_base/applications/internet/smb4k/debian/watch
deleted file mode 100644
index 70154d877..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/internet/tork/debian/compat b/ubuntu/_base/applications/internet/tork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/internet/tork/debian/compat
+++ b/ubuntu/_base/applications/internet/tork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/internet/tork/debian/control b/ubuntu/_base/applications/internet/tork/debian/control
index 88b3da7ae..a3b2d8a99 100644
--- a/ubuntu/_base/applications/internet/tork/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/bibletime/debian/compat b/ubuntu/_base/applications/misc/bibletime/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/compat
+++ b/ubuntu/_base/applications/misc/bibletime/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control
index 836837ffc..2b0adecc7 100644
--- a/ubuntu/_base/applications/misc/bibletime/debian/control
+++ b/ubuntu/_base/applications/misc/bibletime/debian/control
@@ -1,6 +1,6 @@
Source: bibletime-trinity
Section: tde
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-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/ubuntu/_base/applications/misc/bibletime/debian/docs b/ubuntu/_base/applications/misc/bibletime/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/misc/bibletime/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
index d1b3a270e..5536499f7 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/misc/desktop-effects-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/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
+++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
index ded360aa2..14ddd5ccc 100644
--- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
+++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends-Indep: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-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
X-Python3-Version: all
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/changelog b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
deleted file mode 100644
index 87f2b117a..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/compat b/ubuntu/_base/applications/misc/fusion-icon/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/control b/ubuntu/_base/applications/misc/fusion-icon/debian/control
deleted file mode 100644
index a934aaf9d..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/control
+++ /dev/null
@@ -1,21 +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>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 9~), quilt, pkg-config, python3-all-dev
-Build-Depends-Indep: dh-python
-Standards-Version: 3.8.4
-
-Package: fusion-icon-trinity
-Architecture: all
-Replaces: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~)
-Breaks: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~)
-Depends: ${misc:Depends}, ${python3:Depends}, python3-gtk2 | python3-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/ubuntu/_base/applications/misc/fusion-icon/debian/copyright b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
deleted file mode 100644
index ae1ce34fa..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
deleted file mode 100644
index 1b15860e1..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
deleted file mode 100644
index fe0843739..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/install b/ubuntu/_base/applications/misc/fusion-icon/debian/install
deleted file mode 100644
index 7d4e26567..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.xpm usr/share/pixmaps
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/links b/ubuntu/_base/applications/misc/fusion-icon/debian/links
deleted file mode 100644
index 51627e83a..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/manpages b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
deleted file mode 100644
index 3ba122a39..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.1
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/menu b/ubuntu/_base/applications/misc/fusion-icon/debian/menu
deleted file mode 100644
index e85a21dbf..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
deleted file mode 100755
index af04bd776..000000000
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/rules
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON3_MODULE_PACKAGES=fusion-icon-trinity
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.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
-
-binary-install/fusion-icon-trinity::
- mkdir -p debian/$(cdbs_curpkg)/usr/local/lib
- cp -Rp debian/$(cdbs_curpkg)/usr/local/* debian/$(cdbs_curpkg)/usr/
- rm -rf debian/$(cdbs_curpkg)/usr/local
- mkdir -p debian/$(cdbs_curpkg)/temp
- mv debian/$(cdbs_curpkg)/usr/lib debian/$(cdbs_curpkg)/temp
- mkdir -p debian/$(cdbs_curpkg)/opt/trinity
- cp -Rp debian/$(cdbs_curpkg)/usr/* debian/$(cdbs_curpkg)/opt/trinity/
- rm -rf debian/$(cdbs_curpkg)/usr
- dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
- ###
- # Must be done after invoking dh_pysupport, otherwise python scripts will
- # end up in /usr/share/pyshare instead of dist-packages
- mkdir -p debian/$(cdbs_curpkg)/usr
- mv debian/$(cdbs_curpkg)/temp/lib debian/$(cdbs_curpkg)/usr
- rm -rf debian/$(cdbs_curpkg)/temp
- ###
- mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
- mv debian/$(cdbs_curpkg)/opt/trinity/share/doc/$(cdbs_curpkg)/* debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/
- rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/doc/$(cdbs_curpkg)
- dh_icons
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/kcmldap/debian/compat b/ubuntu/_base/applications/misc/kcmldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/control b/ubuntu/_base/applications/misc/kcmldap/debian/control
index 12a99af9f..b8a62a2d1 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
index a8b6d7dbb..ff1388334 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
+++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
index ccc066761..189fbb3ce 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/kerberostray/debian/compat b/ubuntu/_base/applications/misc/kerberostray/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/compat
+++ b/ubuntu/_base/applications/misc/kerberostray/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/control b/ubuntu/_base/applications/misc/kerberostray/debian/control
index abf321694..b4b65fb21 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/krecipes/debian/compat b/ubuntu/_base/applications/misc/krecipes/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/compat
+++ b/ubuntu/_base/applications/misc/krecipes/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/control b/ubuntu/_base/applications/misc/krecipes/debian/control
index 4c32c8ee2..cafce1080 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/amarok/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/compat
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 4f20c5065..6e16f1f12 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -4,7 +4,7 @@ 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, tde-cmake, 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,
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/codeine/debian/compat b/ubuntu/_base/applications/multimedia/codeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/compat
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/control b/ubuntu/_base/applications/multimedia/codeine/debian/control
index dd69b3c03..e1ca4d568 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/codeine/debian/patches/series b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
index 9264af04e..426d3811a 100644
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7b99dabec..7b65b9a3f 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,8 +1,5 @@
remove build-dep on libdvdread-dev
-libk3b3-extracodecs conflicts libk3b2-extracodecs
-transitional libk3b2-extracodecs package
-
Do not recommend on tdebase-tdeio-plugins, kcontrol,
Change recommend to suggest for vcdimager
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/k3b/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
index 98ccad5d3..b4a28b818 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/control
+++ b/ubuntu/_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, tde-cmake, 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
@@ -63,7 +63,7 @@ Section: libs
Architecture: any
Replaces: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
Breaks: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
-Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
+Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity
Depends: ${shlibs:Depends}
Description: The TDE cd burning application library - runtime files [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
@@ -78,7 +78,6 @@ Architecture: any
Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}
-Conflicts: libk3b2-mp3-trinity
Description: The TDE cd burning application library - extra decoders [Trinity]
K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
Its aim is to provide a very user friendly interface to all the tasks
@@ -86,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity]
.
This package contains runtime libraries for the MP3 and FFMPEG decoder plugin.
-Package: libk3b2-extracodecs-trinity
-Architecture: all
-Priority: extra
-Replaces: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Breaks: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~)
-Depends: libk3b3-extracodecs-trinity
-Description: transitional package for K3b's extra decoders [Trinity]
- This is a dummy transitional package to enable a smooth transition from
- libk3b2-extracodecs to libk3b3-extracodecs.
- It may safely be removed after installation.
-
Package: k3b-trinity-dbg
Priority: extra
Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
deleted file mode 100644
index 3b3a0add7..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/apps/*
-usr/share/icons/*
-usr/share/kde/*
-usr/share/sounds/*
-usr/share/doc/tde/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
deleted file mode 100644
index b7175c514..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/tmp/usr/share/applnk/.hidden/*
-debian/tmp/usr/share/apps/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/tde/*
-debian/tmp/usr/share/sounds/*
-debian/tmp/usr/share/mimelnk/*
-debian/tmp/usr/share/services/*
-debian/k3b-rip-audiocd.desktop usr/share/kde4/apps/solid/actions
-debian/k3b-rip-videodvd.desktop usr/share/kde4/apps/solid/actions
-debian/k3b-write-iso-image.desktop usr/share/kde4/services/ServiceMenus
-debian/k3b-write-bin-image.desktop usr/share/kde4/services/ServiceMenus
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
deleted file mode 100644
index d45003d06..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*.la
-usr/lib/*.so
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
deleted file mode 100644
index 6257a06d1..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libk3b.so
-debian/tmp/usr/lib/libk3bdevice.so
-debian/tmp/usr/include/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
deleted file mode 100644
index 0e57a97dc..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/trinity/libk3bmaddecoder.*
-#debian/tmp/usr/lib/trinity/libk3bffmpegdecoder.*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
deleted file mode 100644
index d77e53e7c..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*.so.*
-usr/lib/libk3baudio*.{so,la}
-usr/lib/trinity/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
deleted file mode 100644
index 69b7f7909..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
+++ /dev/null
@@ -1,25 +0,0 @@
-debian/tmp/usr/lib/libk3b.so.*
-debian/tmp/usr/lib/libk3bdevice.so.*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.la
-debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.so
-debian/tmp/usr/lib/trinity/libk3bexternalencoder.la
-debian/tmp/usr/lib/trinity/libk3bexternalencoder.so
-debian/tmp/usr/lib/trinity/libk3bflacdecoder.la
-debian/tmp/usr/lib/trinity/libk3bflacdecoder.so
-debian/tmp/usr/lib/trinity/libk3bmpcdecoder.la
-debian/tmp/usr/lib/trinity/libk3bmpcdecoder.so
-debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.la
-debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.so
-debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.la
-debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.so
-debian/tmp/usr/lib/trinity/libk3bsoxencoder.la
-debian/tmp/usr/lib/trinity/libk3bsoxencoder.so
-debian/tmp/usr/lib/trinity/libk3bwavedecoder.la
-debian/tmp/usr/lib/trinity/libk3bwavedecoder.so
-debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so
-debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la
-debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so
-debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/usr/lib/trinity/tdeio_videodvd.so
-debian/tmp/usr/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules
index 72db8e489..0cd87b24d 100755
--- a/ubuntu/_base/applications/multimedia/k3b/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b/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 = t64
+else
+DEB_TIME64_SUFFIX =
+endif
+
+
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -14,3 +22,41 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_ALL_OPTIONS="ON"
+
+
+post-patches::
+ dh_testdir
+ifeq ($(DEB_TIME64_API),true)
+ # update library package name for TIME64 ABI
+ ls -d debian/* | \
+ grep -E "/libk3b3-trinity\." | \
+ grep -v "\.t64$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.t64 ] || \
+ (cp -a $$a debian/libk3b3$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \
+ done
+ [ -f debian/control.t64 ] || \
+ sed -i.t64 \
+ -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \
+ -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \
+ -e "s/\\(libk3b3\\)-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 "/libk3b3$(DEB_TIME64_SUFFIX)-" | \
+ xargs -r rm
+ [ ! -f debian/control.t64 ] || \
+ mv debian/control.t64 debian/control
+endif
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/k9copy/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
@@ -1,2 +1,2 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control
index c0784a2c0..beb816701 100644
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
index 6219a645e..a6797f19a 100755
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
index 9b96282d8..3567b8f9e 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/kaffeine/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
index c986fc30e..1f2c3098a 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/kmplayer/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
index a0780bd77..85a13e26e 100644
--- a/ubuntu/_base/applications/multimedia/kmplayer/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/kplayer/debian/compat b/ubuntu/_base/applications/multimedia/kplayer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/control b/ubuntu/_base/applications/multimedia/kplayer/debian/control
index 70c39e61e..20fdf0f39 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
index cbe09f5c7..675c8fd5f 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/rosegarden/debian/compat b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
index 522ca804c..b55aec989 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/multimedia/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
index 1372a08f8..5839a4d6d 100755
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
index c7ae17d47..1e5845fbd 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series
diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
index fa0a1f580..a6797f19a 100755
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
index fcfaef212..485f58a96 100644
--- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/multimedia/tderadio/debian/compat b/ubuntu/_base/applications/multimedia/tderadio/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/compat
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/control b/ubuntu/_base/applications/multimedia/tderadio/debian/control
index db48d3858..594d6c136 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/basket/debian/compat b/ubuntu/_base/applications/office/basket/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/basket/debian/compat
+++ b/ubuntu/_base/applications/office/basket/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control
index d595cdb87..11dd982bf 100644
--- a/ubuntu/_base/applications/office/basket/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kbibtex/debian/compat b/ubuntu/_base/applications/office/kbibtex/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/compat
+++ b/ubuntu/_base/applications/office/kbibtex/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control
index 3f8d102e4..84e2ce4f8 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kbookreader/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat
index 48c962ffa..021ea30c0 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/compat
+++ b/ubuntu/_base/applications/office/kbookreader/debian/compat
@@ -1,2 +1,2 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control
index bdfbcc5f5..c362b7f9e 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/keximdb/debian/compat b/ubuntu/_base/applications/office/keximdb/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/keximdb/debian/compat
+++ b/ubuntu/_base/applications/office/keximdb/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/keximdb/debian/control b/ubuntu/_base/applications/office/keximdb/debian/control
index 29a6ef860..e3117201b 100644
--- a/ubuntu/_base/applications/office/keximdb/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kile/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kile/debian/compat
+++ b/ubuntu/_base/applications/office/kile/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 4aa930bfc..a8cf1cf71 100644
--- a/ubuntu/_base/applications/office/kile/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kmymoney/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/compat
+++ b/ubuntu/_base/applications/office/kmymoney/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
index dfcb3d071..d6011e239 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/knowit/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/knowit/debian/compat
+++ b/ubuntu/_base/applications/office/knowit/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control
index cc62006c3..cc453f515 100644
--- a/ubuntu/_base/applications/office/knowit/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/koffice-i18n/debian/compat b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/compat
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control
index 3f9b51deb..d4a192d8d 100644
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/control
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control
@@ -2,7 +2,7 @@ Source: koffice-i18n-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: koffice-i18n-trinity
diff --git a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/koffice/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/compat
+++ b/ubuntu/_base/applications/office/koffice/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control
index d22475ffb..af290bec8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/control
+++ b/ubuntu/_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-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
Breaks: koffice-libs-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
index 25a8c006f..806f0020c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
index c77411ba2..888cebb0a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 74f77679d..4e0bf33b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index 252102b05..5f43c4233 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,3 @@
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/ubuntu/_base/applications/office/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules
index 397783a27..741529df1 100755
--- a/ubuntu/_base/applications/office/koffice/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/kpilot/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/kpilot/debian/compat
+++ b/ubuntu/_base/applications/office/kpilot/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control
index 1f9af5e48..4483a0767 100644
--- a/ubuntu/_base/applications/office/kpilot/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/office/tellico/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/tellico/debian/compat
+++ b/ubuntu/_base/applications/office/tellico/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control
index 5265062c0..35625317b 100644
--- a/ubuntu/_base/applications/office/tellico/debian/control
+++ b/ubuntu/_base/applications/office/tellico/debian/control
@@ -3,7 +3,7 @@ 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, tde-cmake, 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, dh-python
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kdpkg/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/compat
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control
index fbd9dd574..5f096c6d5 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kima/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kima/debian/compat
+++ b/ubuntu/_base/applications/settings/kima/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control
index 6e39c0abb..8d21a1c39 100644
--- a/ubuntu/_base/applications/settings/kima/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/compat
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control
index 69149589f..7ccf337ad 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kkbswitch/debian/compat b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/compat
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/control b/ubuntu/_base/applications/settings/kkbswitch/debian/control
index aecfa09b2..062a4acc4 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/klcddimmer/debian/compat b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/compat
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/control b/ubuntu/_base/applications/settings/klcddimmer/debian/control
index 6fe326657..c18e2f223 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
index 7754434bd..5c4cc4d06 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
index 3a28b6931..311ed806e 100644
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/install
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
deleted file mode 100644
index cff01643d..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
deleted file mode 100644
index fab755280..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kmyfirewall.1
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
index 8b7e87e26..76a0f44d3 100755
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
deleted file mode 100644
index 42dfe005b..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmyfirewall/kmyfirewall-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..b031e6981
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/compat b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/compat
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
index 8b552881a..547203533 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/control
+++ b/ubuntu/_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, pytqt-dev, python3-pytqt, python3-pytde, pytde-dev, python3-sip-tqt-dev,
- dh-python, python3-all, python3-all-dev, x11proto-scrnsaver-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}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, init | sysv-rc, guidance-backends-trinity, hwdata, python3-all, python3-all-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, guidance-backends-trinity, python3-all, python3-all-dev
Replaces: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
Conflicts: guidance-power-manager, kde-guidance-powermanager
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,9 +29,9 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
Package: guidance-backends-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, hwdata, python3-all, python3-all-dev
-Replaces: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
-Breaks: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
+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: ${python3:Provides}
Description: collection of system administration tools for GNU/Linux [Trinity]
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
index 724e08449..ca0272abf 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs
@@ -1,2 +1,3 @@
+AUTHORS
README
TODO
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
index d292fc8d3..d9e850d6c 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
deleted file mode 100644
index d3076cc3c..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
index 0e7ddddcb..a6797f19a 100755
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
@@ -1,164 +1,17 @@
#!/usr/bin/make -f
-DEB_PYTHON3_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
-include /usr/share/cdbs/1/class/python-distutils.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
-
-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
-
-binary-install/tde-guidance-trinity::
- dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
-
-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
-
-binary-install/guidance-backends-trinity::
- dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 $(PYSUPPORT_INST_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/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
deleted file mode 100644
index 8ef180de8..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
index e6a81f4d4..d39b3faac 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
index f151ee69f..e83480662 100644
--- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
deleted file mode 100644
index af8e365b5..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
deleted file mode 100644
index 1fda3dd19..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
index 2d30df58b..9ab49cc98 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
index 4949288f8..1c572b7d4 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
@@ -2,7 +2,7 @@ Source: tdenetworkmanager-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
+Build-Depends: cdbs, debhelper (>= 10~), quilt,
tde-cmake, ninja-build,
tdelibs14-trinity-dev,
libiw-dev,
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..93aadf394 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
deleted file mode 100644
index df7b9dba2..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/tdesudo/debian/compat b/ubuntu/_base/applications/settings/tdesudo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/compat
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/control b/ubuntu/_base/applications/settings/tdesudo/debian/control
index f54ebacf5..8809724e2 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/settings/wlassistant/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/compat
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control
index 723984bca..1b45a6f07 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/dolphin/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/dolphin/debian/compat
+++ b/ubuntu/_base/applications/system/dolphin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control
index db21728ad..9ba8e229c 100644
--- a/ubuntu/_base/applications/system/dolphin/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/katapult/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/katapult/debian/compat
+++ b/ubuntu/_base/applications/system/katapult/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control
index f58c417d7..e36558fc3 100644
--- a/ubuntu/_base/applications/system/katapult/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kbfx/debian/compat b/ubuntu/_base/applications/system/kbfx/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kbfx/debian/compat
+++ b/ubuntu/_base/applications/system/kbfx/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control
index 5c7c34ab2..29ad9b721 100644
--- a/ubuntu/_base/applications/system/kbfx/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/kbfx/debian/postinst b/ubuntu/_base/applications/system/kbfx/debian/postinst
deleted file mode 100644
index e95a6906b..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kcmautostart/debian/compat b/ubuntu/_base/applications/system/kcmautostart/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/compat
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/control b/ubuntu/_base/applications/system/kcmautostart/debian/control
index 1c41fd793..cf5da73c2 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kdbusnotification/debian/compat b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/compat
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control
index 928563edb..bfebf027e 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/klamav/debian/compat b/ubuntu/_base/applications/system/klamav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/klamav/debian/compat
+++ b/ubuntu/_base/applications/system/klamav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/klamav/debian/control b/ubuntu/_base/applications/system/klamav/debian/control
index 775e3c2ac..833f05123 100644
--- a/ubuntu/_base/applications/system/klamav/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/knemo/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knemo/debian/compat
+++ b/ubuntu/_base/applications/system/knemo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control
index d5ef8c607..e325d1a14 100644
--- a/ubuntu/_base/applications/system/knemo/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/knetload/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knetload/debian/compat
+++ b/ubuntu/_base/applications/system/knetload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control
index 82669b5a7..ba4059f72 100644
--- a/ubuntu/_base/applications/system/knetload/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/knetload/debian/patches/series b/ubuntu/_base/applications/system/knetload/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/system/knetload/debian/patches/series
+++ b/ubuntu/_base/applications/system/knetload/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/knetstats/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/compat
+++ b/ubuntu/_base/applications/system/knetstats/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control
index 2b64c8ee6..f559e7a13 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kooldock/debian/compat b/ubuntu/_base/applications/system/kooldock/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/compat
+++ b/ubuntu/_base/applications/system/kooldock/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kooldock/debian/control b/ubuntu/_base/applications/system/kooldock/debian/control
index dcc29535b..8ad561f40 100644
--- a/ubuntu/_base/applications/system/kooldock/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/krusader/debian/compat b/ubuntu/_base/applications/system/krusader/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/krusader/debian/compat
+++ b/ubuntu/_base/applications/system/krusader/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control
index 98b03a2c2..0dc597981 100644
--- a/ubuntu/_base/applications/system/krusader/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kshutdown/debian/compat b/ubuntu/_base/applications/system/kshutdown/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/compat
+++ b/ubuntu/_base/applications/system/kshutdown/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/control b/ubuntu/_base/applications/system/kshutdown/debian/control
index 57b0547b8..ef9690fce 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/ksystemlog/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/compat
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control
index ec1a62a63..3dc228b22 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/kvkbd/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/compat
+++ b/ubuntu/_base/applications/system/kvkbd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control
index d2f1c64a2..fcff08f9b 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
index 4bbe3fe17..7fb2e0d3b 100644
--- a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/smartcardauth/debian/compat b/ubuntu/_base/applications/system/smartcardauth/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/compat
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
index 7cc869204..97c6fb93e 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tastymenu/debian/compat b/ubuntu/_base/applications/system/tastymenu/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/compat
+++ b/ubuntu/_base/applications/system/tastymenu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/control b/ubuntu/_base/applications/system/tastymenu/debian/control
index 324db2e4c..3b1ca1154 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/tastymenu/debian/patches/series b/ubuntu/_base/applications/system/tastymenu/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/system/tastymenu/debian/patches/series
+++ b/ubuntu/_base/applications/system/tastymenu/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/changelog b/ubuntu/_base/applications/system/tdebluez/debian/changelog
new file mode 100644
index 000000000..d779b284e
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/compat b/ubuntu/_base/applications/system/tdebluez/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/control b/ubuntu/_base/applications/system/tdebluez/debian/control
new file mode 100644
index 000000000..dcfa46b04
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/copyright b/ubuntu/_base/applications/system/tdebluez/debian/copyright
new file mode 100644
index 000000000..7fc5c091b
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/docs b/ubuntu/_base/applications/system/tdebluez/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdebluez/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install
new file mode 100644
index 000000000..6425a944e
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install
new file mode 100644
index 000000000..72a1ac2a2
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install
new file mode 100644
index 000000000..e60909e04
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install
new file mode 100644
index 000000000..2557b6e5f
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/rules b/ubuntu/_base/applications/system/tdebluez/debian/rules
new file mode 100755
index 000000000..9c17d4c4c
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/misc/fusion-icon/debian/source/format b/ubuntu/_base/applications/system/tdebluez/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/format
+++ b/ubuntu/_base/applications/system/tdebluez/debian/source/format
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options b/ubuntu/_base/applications/system/tdebluez/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options
+++ b/ubuntu/_base/applications/system/tdebluez/debian/source/options
diff --git a/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install
new file mode 100644
index 000000000..50a3931d0
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install
new file mode 100644
index 000000000..80063c949
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdedocker/debian/compat b/ubuntu/_base/applications/system/tdedocker/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdedocker/debian/compat
+++ b/ubuntu/_base/applications/system/tdedocker/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdedocker/debian/control b/ubuntu/_base/applications/system/tdedocker/debian/control
index 4fc9849f9..c21879563 100644
--- a/ubuntu/_base/applications/system/tdedocker/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdepowersave/debian/compat b/ubuntu/_base/applications/system/tdepowersave/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/compat
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/control b/ubuntu/_base/applications/system/tdepowersave/debian/control
index 8af46f9c4..b0b75e675 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
index e27c64261..f89a3be85 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
deleted file mode 100644
index a00246bd9..000000000
--- a/ubuntu/_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/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
index 5b4e8bfd7..aba508624 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/tdesshaskpass/debian/compat b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/control b/ubuntu/_base/applications/system/tdesshaskpass/debian/control
index 26ef09a5b..02382a5e9 100644
--- a/ubuntu/_base/applications/system/tdesshaskpass/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/system/yakuake/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/yakuake/debian/compat
+++ b/ubuntu/_base/applications/system/yakuake/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control
index 77754d34d..6d3c001d0 100644
--- a/ubuntu/_base/applications/system/yakuake/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
index 8630402cd..3b616818e 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
index 330fd8e24..ff1e186ca 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
index 9af2ef245..feb19c97d 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
index 0ec130796..578f51c5a 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
index e4f55d538..094ec1441 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control
+++ b/ubuntu/_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, tde-cmake, 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-locate-trinity
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
index 63d5231ef..dd1d46eaa 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
index e570d8170..9e47a2bdf 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
index 6c46b04f4..a61cbc58b 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
index dcaad73ba..7396b1661 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
index 066451f4b..5ff259535 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..794921e5e 100644
--- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
index 26967822a..5b8ab8b3a 100644
--- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
+++ b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
index a8384ff60..dcfc6981b 100644
--- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
index 07d69cee2..5001c8667 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
index 475315ddc..b021de201 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-domino/debian/compat b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/control b/ubuntu/_base/applications/themes/tde-style-domino/debian/control
index 3b5ca7338..fd59eeb97 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
index f6bc56f57..9daa84f38 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control
+++ b/ubuntu/_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, tde-cmake, ninja-build, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libgtk2.0-dev
Standards-Version: 3.8.0
Package: tde-style-ia-ora-trinity
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
index bec0ef6e3..45054b2b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog b/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog
new file mode 100644
index 000000000..fd3fb7e76
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/control b/ubuntu/_base/applications/themes/tde-style-polyester/debian/control
new file mode 100644
index 000000000..1e46cfe80
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright b/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright
new file mode 100644
index 000000000..e2d3d0919
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-polyester/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/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
+++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
index f7140d632..797ea1d4a 100644
--- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/tdmtheme/debian/compat b/ubuntu/_base/applications/themes/tdmtheme/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/compat
+++ b/ubuntu/_base/applications/themes/tdmtheme/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/control b/ubuntu/_base/applications/themes/tdmtheme/debian/control
index 872593d34..f636eac7e 100644
--- a/ubuntu/_base/applications/themes/tdmtheme/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
index 1c71ff873..37311104c 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
index 307a62d83..f075cb563 100644
--- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog
new file mode 100644
index 000000000..7b0f84239
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control
new file mode 100644
index 000000000..9be6b38e1
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright
new file mode 100644
index 000000000..7ba2bdbcc
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/wizard_stamp_v0.7.1
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/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/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/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/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
index 21d8d3ac3..59237598a 100644
--- a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
@@ -3,7 +3,7 @@ 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 (>= 9~), quilt, tde-cmake, 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-machbunt-trinity
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
+++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
index bebbe6914..dcb0af17d 100644
--- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/abakus/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/abakus/debian/compat
+++ b/ubuntu/_base/applications/utilities/abakus/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control
index 70442170b..b0beacffc 100644
--- a/ubuntu/_base/applications/utilities/abakus/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/filelight/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/filelight/debian/compat
+++ b/ubuntu/_base/applications/utilities/filelight/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control
index 42e66a711..9aee2dca8 100644
--- a/ubuntu/_base/applications/utilities/filelight/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kbarcode/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/compat
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control
index 7e4b0ae55..abea8a792 100644
--- a/ubuntu/_base/applications/utilities/kbarcode/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kchmviewer/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
index b4b26bf94..5eb117c7d 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kcpuload/debian/compat b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/compat
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control
index 6fdf66b3b..19f52b886 100644
--- a/ubuntu/_base/applications/utilities/kcpuload/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kdirstat/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/compat
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control
index 7b8b28e06..ec7a51718 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/keep/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/compat
+++ b/ubuntu/_base/applications/utilities/keep/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control
index c8a7e5b6f..39ea15546 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/knutclient/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/compat
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control
index 4a6d9a0f6..31a76b958 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/changelog b/ubuntu/_base/applications/utilities/kommando/debian/changelog
new file mode 100644
index 000000000..6259ef8bc
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/compat b/ubuntu/_base/applications/utilities/kommando/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/control b/ubuntu/_base/applications/utilities/kommando/debian/control
new file mode 100644
index 000000000..e29e23d86
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/copyright b/ubuntu/_base/applications/utilities/kommando/debian/copyright
new file mode 100644
index 000000000..be9aabb0b
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/docs b/ubuntu/_base/applications/utilities/kommando/debian/docs
new file mode 100644
index 000000000..6f83607c1
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/patches/series b/ubuntu/_base/applications/utilities/kommando/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/patches/series
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/rules b/ubuntu/_base/applications/utilities/kommando/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kommando/debian/source/format b/ubuntu/_base/applications/utilities/kommando/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/kommando/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/utilities/kommando/debian/source/options b/ubuntu/_base/applications/utilities/kommando/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/kompose/debian/compat b/ubuntu/_base/applications/utilities/kompose/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/kompose/debian/compat
+++ b/ubuntu/_base/applications/utilities/kompose/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/kompose/debian/control b/ubuntu/_base/applications/utilities/kompose/debian/control
index cc9396866..a808f8827 100644
--- a/ubuntu/_base/applications/utilities/kompose/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/krename/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/compat
+++ b/ubuntu/_base/applications/utilities/krename/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control
index 68c0e3838..1e62c4a05 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/ksensors/debian/compat b/ubuntu/_base/applications/utilities/ksensors/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/compat
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/control b/ubuntu/_base/applications/utilities/ksensors/debian/control
index 1052143da..497a3b570 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/mathemagics/debian/compat b/ubuntu/_base/applications/utilities/mathemagics/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/compat
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/control b/ubuntu/_base/applications/utilities/mathemagics/debian/control
index 582ef4438..3128539a1 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
index 645b35aad..4cce4bb33 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
index 8b1378917..e69de29bb 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/ubuntu/_base/core/tde-i18n/debian/compat b/ubuntu/_base/core/tde-i18n/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tde-i18n/debian/compat
+++ b/ubuntu/_base/core/tde-i18n/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control
index f952a2cca..33461f159 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tde-i18n/debian/control-lang b/ubuntu/_base/core/tde-i18n/debian/control-lang
index 5d409c28d..2fce8baf8 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control-lang
+++ b/ubuntu/_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/ubuntu/_base/core/tde-i18n/debian/control-source b/ubuntu/_base/core/tde-i18n/debian/control-source
index 984fed2a5..b959dad00 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control-source
+++ b/ubuntu/_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/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeaccessibility/debian/compat b/ubuntu/_base/core/tdeaccessibility/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/compat
+++ b/ubuntu/_base/core/tdeaccessibility/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control
index 75a1d80c3..ecc06a9a0 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeaddons/debian/compat b/ubuntu/_base/core/tdeaddons/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeaddons/debian/compat
+++ b/ubuntu/_base/core/tdeaddons/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeaddons/debian/control b/ubuntu/_base/core/tdeaddons/debian/control
index 41b68349b..3cc04d044 100644
--- a/ubuntu/_base/core/tdeaddons/debian/control
+++ b/ubuntu/_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, 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), libdb4.8++-dev | libdb++-dev, libogg-dev, dh-python
+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
diff --git a/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian
deleted file mode 100644
index 705d74139..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeadmin/debian/compat b/ubuntu/_base/core/tdeadmin/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeadmin/debian/compat
+++ b/ubuntu/_base/core/tdeadmin/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeadmin/debian/control b/ubuntu/_base/core/tdeadmin/debian/control
index 7dde875bf..917184580 100644
--- a/ubuntu/_base/core/tdeadmin/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeartwork/debian/compat b/ubuntu/_base/core/tdeartwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeartwork/debian/compat
+++ b/ubuntu/_base/core/tdeartwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeartwork/debian/control b/ubuntu/_base/core/tdeartwork/debian/control
index a73665fbf..15b472ff5 100644
--- a/ubuntu/_base/core/tdeartwork/debian/control
+++ b/ubuntu/_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, 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-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/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/compat b/ubuntu/_base/core/tdebase/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdebase/debian/compat
+++ b/ubuntu/_base/core/tdebase/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index f2fe8a9eb..0d88bcb73 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_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, tde-cmake, 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-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~)
Breaks: kicker-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst
deleted file mode 100644
index 0b3eb0b52..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install
index 96fce70e1..4e883cb6b 100644
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
index 3a278bff7..c57f28095 100644
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst
deleted file mode 100644
index b6b0656b7..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
index bee8b8020..c46e478c8 100644
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst
deleted file mode 100644
index b2c57de01..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
index c36dd0445..f9d56b353 100644
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst
deleted file mode 100644
index b3a79cc14..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
index 7006dfe10..f0a12e1aa 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
index 532e028bd..3b7be1e92 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_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)
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
index 2c7c61596..74b77ecf6 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 14e203a41..3b85196bb 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_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)
diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 598cd7092..99db98c6f 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,6 +1,6 @@
--- a/starttde
+++ b/starttde
-@@ -288,17 +288,17 @@
+@@ -396,17 +396,17 @@
. "$tdehome/share/config/startupconfig"
fi
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 79aebbd1d..bb1dccd7b 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -2,7 +2,7 @@ diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
index dd64b58..0af3e44 100644
--- a/kate/data/kwrite.desktop
+++ b/kate/data/kwrite.desktop
-@@ -109,3 +109,4 @@ Terminal=false
+@@ -12,3 +12,4 @@ Terminal=false
X-TDE-InitialPreference=8
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;TextEditor;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 608802a75..64adee330 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
index 6003b68..f33e1f4 100644
--- a/knetattach/knetattach.desktop
+++ b/knetattach/knetattach.desktop
-@@ -80,3 +80,4 @@ Terminal=false
+@@ -11,3 +11,4 @@ Terminal=false
X-TDE-StartupNotify=true
Categories=Qt;TDE;Network;
X-DocPath=knetattach/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bbb613a9..e5b89e2ba 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/kpersonalizer/kpersonalizer.desktop-orig 2005-03-17 01:05:16.091600616 +0000
+++ tdebase/kpersonalizer/kpersonalizer.desktop 2005-03-17 01:05:23.678447240 +0000
-@@ -77,3 +77,4 @@
+@@ -13,3 +13,4 @@
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Settings;
OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index e12245486..ef79cc8eb 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -2,7 +2,7 @@ Index: b/konqueror/konquerorsu.desktop
===================================================================
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
-@@ -88,3 +88,4 @@
+@@ -11,3 +11,4 @@
Categories=Qt;TDE;X-TDE-System-su;
OnlyShowIn=TDE;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index 009d6f9db..e8f88b7f4 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -2,7 +2,7 @@ diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefon
index 5d5e2b8..c989adf 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -99,3 +99,4 @@ Terminal=false
+@@ -10,3 +10,4 @@ Terminal=false
X-TDE-InitialPreference=1
Categories=Qt;TDE;Graphics;
X-DocPath=tdefontview/index.html
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 3eab104cb..e1d2567bd 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/kpager/kpager.desktop
+++ tdebase/kpager/kpager.desktop
-@@ -96,3 +96,4 @@
+@@ -11,3 +11,4 @@
X-TDE-StartupNotify=false
X-DCOP-ServiceType=Unique
Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
index a46ab143c..bfac9d8ea 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
@@ -1,6 +1,6 @@
--- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
+++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
-@@ -90,3 +90,4 @@
+@@ -9,3 +9,4 @@
Terminal=false
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index baeb8bfd5..fa2b265e5 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -11,7 +11,7 @@
TQHBoxLayout* hbuttonbox;
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
-@@ -697,7 +697,7 @@
+@@ -725,7 +725,7 @@
2 * KDialog::spacingHint() );
// default factor
@@ -20,3 +20,14 @@
// slighty more space for the new logout
int factor = 2;
+--- a/kcontrol/smserver/kcmsmserver.cpp
++++ b/kcontrol/smserver/kcmsmserver.cpp
+@@ -94,7 +94,7 @@
+
+ c->setGroup("Logout");
+ dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+- dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false));
++ dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", true));
+ dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
+ dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
+ dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 8db1221a5..98fae0e38 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -1,6 +1,6 @@
--- tdebase-3.5.7/kfind/Kfind.desktop
+++ tdebase-3.5.7/kfind/Kfind.desktop
-@@ -73,3 +73,4 @@
+@@ -9,3 +9,4 @@
X-TDE-StartupNotify=true
OnlyShowIn=TDE;
Categories=Qt;TDE;Core;
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
index c312b6fb7..49a653275 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
@@ -1,6 +1,6 @@
--- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200
+++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200
-@@ -996,9 +996,14 @@ ReapChildren( void )
+@@ -1023,9 +1023,14 @@ ReapChildren( void )
/* don't kill again */
break;
case running:
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules
index df3327542..8cdb710e0 100755
--- a/ubuntu/_base/core/tdebase/debian/rules
+++ b/ubuntu/_base/core/tdebase/debian/rules
@@ -45,6 +45,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
-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/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
index ffd4cc04a..0ab9bc8a8 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
index c8666a793..9ddb66bc2 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
index 6501cf36b..ddaa5b274 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
index 52cd10d88..8410a13ae 100644
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst
deleted file mode 100644
index c812a9390..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
index 23de3a247..d51bcd8dc 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm
@@ -172,4 +172,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
fi
fi
+#DEBHELPER#
+
exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install
index 381a173be..52c59c4a7 100644
--- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdebindings/debian/compat b/ubuntu/_base/core/tdebindings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdebindings/debian/compat
+++ b/ubuntu/_base/core/tdebindings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index 360a8ad23..1bda66f65 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
Source: tdebindings-trinity
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
+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,
+ tdelibs14-trinity-dev,
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
Section: devel
Priority: optional
diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules
index 5fe76afb1..f7d6f4790 100755
--- a/ubuntu/_base/core/tdebindings/debian/rules
+++ b/ubuntu/_base/core/tdebindings/debian/rules
@@ -29,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...
diff --git a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeedu/debian/compat b/ubuntu/_base/core/tdeedu/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeedu/debian/compat
+++ b/ubuntu/_base/core/tdeedu/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeedu/debian/control b/ubuntu/_base/core/tdeedu/debian/control
index c1527d29f..121b7140c 100644
--- a/ubuntu/_base/core/tdeedu/debian/control
+++ b/ubuntu/_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, 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
+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/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdegames/debian/compat b/ubuntu/_base/core/tdegames/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdegames/debian/compat
+++ b/ubuntu/_base/core/tdegames/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdegames/debian/control b/ubuntu/_base/core/tdegames/debian/control
index 357063501..c7c4a74b5 100644
--- a/ubuntu/_base/core/tdegames/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdegraphics/debian/compat b/ubuntu/_base/core/tdegraphics/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdegraphics/debian/compat
+++ b/ubuntu/_base/core/tdegraphics/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control
index 2cfdb12be..7105a7f6e 100644
--- a/ubuntu/_base/core/tdegraphics/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..dbcda26a3 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
index 89f453cea..121ed9a1b 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdelibs/debian/compat b/ubuntu/_base/core/tdelibs/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdelibs/debian/compat
+++ b/ubuntu/_base/core/tdelibs/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index 33c0313e8..2af3ea23e 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_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, tde-cmake, 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],
@@ -29,7 +29,7 @@ Replaces: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
Breaks: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
Provides: tdelibs
Conflicts: 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/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules
index eafe84957..533c0ed51 100755
--- a/ubuntu/_base/core/tdelibs/debian/rules
+++ b/ubuntu/_base/core/tdelibs/debian/rules
@@ -13,6 +13,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 =
+endif
+
+
DEB_KDE_APIDOX := yes
version=Debian Package $(DEB_VERSION)
@@ -105,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/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index d06f09083..615399188 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
index f2a8d925b..99078621c 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst
+++ b/ubuntu/_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/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
index aae9f3600..40c135b0c 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm
@@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace"
case "$1" in
remove)
- ldconfig
;;
abort-upgrade)
diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdemultimedia/debian/compat b/ubuntu/_base/core/tdemultimedia/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/compat
+++ b/ubuntu/_base/core/tdemultimedia/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdemultimedia/debian/control b/ubuntu/_base/core/tdemultimedia/debian/control
index f80e14e30..3ac50dd74 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/control
+++ b/ubuntu/_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, 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
+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/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
index 3e0d2daf7..4ee39eb84 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_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/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
index c802a5b07..914623090 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
index 9cba1f36a..e5e13fb57 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/compat b/ubuntu/_base/core/tdenetwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdenetwork/debian/compat
+++ b/ubuntu/_base/core/tdenetwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdenetwork/debian/control b/ubuntu/_base/core/tdenetwork/debian/control
index 5f7a93ff8..b89afb1bb 100644
--- a/ubuntu/_base/core/tdenetwork/debian/control
+++ b/ubuntu/_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, 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
+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/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst
deleted file mode 100644
index 5076ff321..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian
index f219b1176..6cd864e57 100644
--- a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst
deleted file mode 100644
index 1ee118baa..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..f85b1021c 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
index 46b3c424c..54cb2ca36 100644
--- a/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install
@@ -2,13 +2,14 @@ debian/tmp/opt/trinity/share/services/zeroconf.protocol
debian/tmp/opt/trinity/share/services/invitation.protocol
debian/tmp/opt/trinity/share/services/kded/dnssdwatcher.desktop
debian/tmp/opt/trinity/share/apps/remoteview/zeroconf.desktop
-debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp
debian/tmp/opt/trinity/share/apps/zeroconf/_ftp._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp
debian/tmp/opt/trinity/share/apps/zeroconf/_ldap._tcp
-debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
debian/tmp/opt/trinity/share/apps/zeroconf/_nfs._tcp
-debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
debian/tmp/opt/trinity/share/apps/zeroconf/_rfb._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_sftp-ssh._tcp
+debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.so
debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.la
debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.so
diff --git a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdepim/debian/compat b/ubuntu/_base/core/tdepim/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdepim/debian/compat
+++ b/ubuntu/_base/core/tdepim/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control
index 8ddfc5213..756e22d00 100644
--- a/ubuntu/_base/core/tdepim/debian/control
+++ b/ubuntu/_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, tde-cmake, 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-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
Breaks: kdepim-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules
index f2de846ca..874cc57ac 100755
--- a/ubuntu/_base/core/tdepim/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
index 6759ea297..189c5f2f2 100644
--- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst
deleted file mode 100644
index 800a596bf..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdesdk/debian/compat b/ubuntu/_base/core/tdesdk/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdesdk/debian/compat
+++ b/ubuntu/_base/core/tdesdk/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control
index 48676ce43..0001d479c 100644
--- a/ubuntu/_base/core/tdesdk/debian/control
+++ b/ubuntu/_base/core/tdesdk/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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, 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,
diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdetoys/debian/compat b/ubuntu/_base/core/tdetoys/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdetoys/debian/compat
+++ b/ubuntu/_base/core/tdetoys/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdetoys/debian/control b/ubuntu/_base/core/tdetoys/debian/control
index 26d18d8d2..a0a19c2eb 100644
--- a/ubuntu/_base/core/tdetoys/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst
deleted file mode 100644
index 99a084399..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..66bb7fec8 100644
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst
deleted file mode 100644
index b919d035f..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/compat b/ubuntu/_base/core/tdeutils/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeutils/debian/compat
+++ b/ubuntu/_base/core/tdeutils/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control
index 8097c8ada..0edc263b7 100644
--- a/ubuntu/_base/core/tdeutils/debian/control
+++ b/ubuntu/_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, 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: 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/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..3c468628f 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst
deleted file mode 100644
index 6cf1c841c..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fbe5924d2 100644
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst
deleted file mode 100644
index 1fa143a43..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..666092455 100644
--- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst
deleted file mode 100644
index 9119d5017..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdevelop/debian/compat b/ubuntu/_base/core/tdevelop/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdevelop/debian/compat
+++ b/ubuntu/_base/core/tdevelop/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdevelop/debian/control b/ubuntu/_base/core/tdevelop/debian/control
index 0a9bab109..dd8099bc1 100644
--- a/ubuntu/_base/core/tdevelop/debian/control
+++ b/ubuntu/_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, 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
+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
diff --git a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/core/tdewebdev/debian/compat b/ubuntu/_base/core/tdewebdev/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdewebdev/debian/compat
+++ b/ubuntu/_base/core/tdewebdev/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdewebdev/debian/control b/ubuntu/_base/core/tdewebdev/debian/control
index cb181d02e..f3d95dbb4 100644
--- a/ubuntu/_base/core/tdewebdev/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/akode/debian/compat b/ubuntu/_base/dependencies/akode/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/akode/debian/compat
+++ b/ubuntu/_base/dependencies/akode/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index dbae03864..07f1b7913 100644
--- a/ubuntu/_base/dependencies/akode/debian/control
+++ b/ubuntu/_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, 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
+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/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/arts/debian/compat b/ubuntu/_base/dependencies/arts/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/arts/debian/compat
+++ b/ubuntu/_base/dependencies/arts/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control
index 7c68ab5fc..c56f1200d 100644
--- a/ubuntu/_base/dependencies/arts/debian/control
+++ b/ubuntu/_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, tde-cmake, 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-kde3 (<< 4:14.0.0~), arts-trinity (<< 4:14.0.0~)
Breaks: arts-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules
index cc4893ca9..a934b8c5a 100755
--- a/ubuntu/_base/dependencies/arts/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/avahi-tqt/debian/compat b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control
index 0948cdcf1..a21507b87 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control
@@ -3,7 +3,7 @@ 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,
+Build-Depends: cdbs, debhelper (>= 10~), quilt,
tde-cmake, ninja-build,
gcc,
pkg-config,
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
index bdbad0562..20064441f 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/dbus-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control
index 19cf25813..d16fa5d28 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libart-lgpl/debian/compat b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/compat
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/control b/ubuntu/_base/dependencies/libart-lgpl/debian/control
index d3d5765bd..8e22d7559 100644
--- a/ubuntu/_base/dependencies/libart-lgpl/debian/control
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
Standards-Version: 3.8.4
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build
Package: libart-2.0-2
Architecture: any
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libcaldav/debian/compat b/ubuntu/_base/dependencies/libcaldav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libcaldav/debian/compat
+++ b/ubuntu/_base/dependencies/libcaldav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control
index 01113e953..35bc4055d 100644
--- a/ubuntu/_base/dependencies/libcaldav/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules
index e898aa6d2..9b371a62d 100755
--- a/ubuntu/_base/dependencies/libcaldav/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libcarddav/debian/compat b/ubuntu/_base/dependencies/libcarddav/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/compat
+++ b/ubuntu/_base/dependencies/libcarddav/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control
index c04fb5f41..1f8eee3bb 100644
--- a/ubuntu/_base/dependencies/libcarddav/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules
index e898aa6d2..22b8c9e32 100755
--- a/ubuntu/_base/dependencies/libcarddav/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/libr/debian/compat b/ubuntu/_base/dependencies/libr/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/libr/debian/compat
+++ b/ubuntu/_base/dependencies/libr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control
index 364400cc1..df44ba5b5 100644
--- a/ubuntu/_base/dependencies/libr/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/libr/debian/libr0.dirs b/ubuntu/_base/dependencies/libr/debian/libr1.dirs
index 68457717b..68457717b 100644
--- a/ubuntu/_base/dependencies/libr/debian/libr0.dirs
+++ b/ubuntu/_base/dependencies/libr/debian/libr1.dirs
diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.install b/ubuntu/_base/dependencies/libr/debian/libr1.install
index d0dbfd18a..d0dbfd18a 100644
--- a/ubuntu/_base/dependencies/libr/debian/libr0.install
+++ b/ubuntu/_base/dependencies/libr/debian/libr1.install
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/polkit-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
index 8a9bfd7d1..27e070a69 100644
--- a/ubuntu/_base/dependencies/polkit-tqt/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/pytqt/debian/compat b/ubuntu/_base/dependencies/pytqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/compat
+++ b/ubuntu/_base/dependencies/pytqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/pytqt/debian/control b/ubuntu/_base/dependencies/pytqt/debian/control
index c736eccdf..d29e68c39 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/control
+++ b/ubuntu/_base/dependencies/pytqt/debian/control
@@ -4,7 +4,7 @@ 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~), 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
+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
diff --git a/ubuntu/_base/dependencies/pytqt/debian/manpages/pylupdate.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
index 4d2c8919a..9e68e9605 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/manpages/pylupdate.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1
@@ -1,4 +1,4 @@
-.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
.\"
.\" Copyright 2001 Trolltech AS. All rights reserved.
.\" Copyright 2004 Ricardo Cardenes. All rights reserved.
@@ -14,20 +14,20 @@
.\" See http://www.trolltech.com/gpl/ for GPL licensing information.
.\"
.SH NAME
-pylupdate \- update Qt Linguist translation files from Python sources
+pytqlupdate \- update TQt Linguist translation files from Python sources
.SH SYNOPSIS
-.B pylupdate
+.B pytqlupdate
.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
+.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 Qt Linguist
+.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
@@ -66,15 +66,15 @@ TRANSLATIONS = gnomovision_dk.ts \\
.in -4
.PP
When running
-.B pylupdate
+.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 lupdate (1),
-.BR lrelease (1)
+.BR tqlupdate (1),
+.BR tqlrelease (1)
and
.BR http://doc.trolltech.com/i18n.html
.SH AUTHOR
diff --git a/ubuntu/_base/dependencies/pytqt/debian/manpages/pyuic.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1
index f1ffa41ff..e456074a2 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/manpages/pyuic.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1
@@ -1,26 +1,26 @@
-.TH pyuic 1 "25 June 2001" \" -*- nroff -*-
+.TH pytquic 1 "25 June 2001" \" -*- nroff -*-
.SH NAME
-pyuic \- Qt user interface compiler for Python
+pytquic \- TQt user interface compiler for Python
.SH SYNOPSIS
-.B pyuic
+.B pytquic
[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
+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 pyuic [options] \fI<uifile>"
+.I "\fB pytquic [options] \fI<uifile>"
.br
.PP
Generate image collection:
.br
-.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
+.I "\fB pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..."
.br
\fI<project>\fP: project name
\fI<image[1..n]>\fP: image files
@@ -28,7 +28,7 @@ Generate image collection:
.PP
Generate subclass implementation:
.br
-.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>"
+.I "\fB pytquic [options] -subimpl <classname> \fI<uifile>"
.br
\fI<classname>\fP: name of the subclass to generate
.PP
@@ -57,13 +57,13 @@ Generate extra code to test the class
Generate extra code to test but not display the class
.TP
.I -version
-Display version of pyuic
+Display version of pytquic
.TP
.I -help
Display this information
.SH "SEE ALSO"
-.BR uic (1)
+.BR tquic (1)
.BR http://www.trolltech.com/
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
index bf01fb211..dd7cab0c0 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install
@@ -1 +1 @@
-usr/lib/python3*/*-packages/PyTQt/qtgl.so
+usr/lib/python3*/*-packages/PyTQt/tqtgl.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install
index fa8e86b21..f18aeefd0 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install
@@ -1,7 +1,7 @@
-usr/lib/python3*/*-packages/PyTQt/qtcanvas.so
-usr/lib/python3*/*-packages/PyTQt/qtnetwork.so
-usr/lib/python3*/*-packages/PyTQt/qtsql.so
-usr/lib/python3*/*-packages/PyTQt/qttable.so
-usr/lib/python3*/*-packages/PyTQt/qtui.so
-usr/lib/python3*/*-packages/PyTQt/qtxml.so
-usr/lib/python3*/*-packages/PyTQt/qt.so
+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/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install
index 9f79185f4..511c1c0c4 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install
@@ -1 +1 @@
-usr/lib/python3*/*-packages/PyTQt/qtext.so
+usr/lib/python3*/*-packages/PyTQt/tqtext.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
index 35f9687f5..1a3799d59 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides
@@ -1,14 +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/qt/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip
-pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip
+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/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install
index b5337b3a3..273120f41 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/pytqt-doc/html
+doc/PyTQt.html usr/share/doc/pytqt-doc/html
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
index 7d27d0034..a8224067a 100644
--- a/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
@@ -1,2 +1,2 @@
-debian/manpages/pylupdate.1
-debian/manpages/pyuic.1
+debian/manpages/pytqlupdate.1
+debian/manpages/pytquic.1
diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py b/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py
new file mode 100644
index 000000000..c25f1f56e
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/dependencies/pytqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules
index c08d9a87b..532bf34bd 100755
--- a/ubuntu/_base/dependencies/pytqt/debian/rules
+++ b/ubuntu/_base/dependencies/pytqt/debian/rules
@@ -97,12 +97,15 @@ install-indep: configure
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())')/PyTQt;\
- mkdir -p debian/pytqt-dev/$$pylib;\
- install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/pytqt-dev/$$pylib;\
+ 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
@@ -131,10 +134,10 @@ install-arch-3.%:
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/qtgl.so \
+ 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/qtext.so \
+ 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:
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/compat b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index 247b6f3b3..2c7df285c 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ 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~), python3-all-dev, python3-all-dbg, 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
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
index 0b31a69ff..e69de29bb 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
@@ -1,2 +0,0 @@
-# siputils_debian_changes.diff
-# siputils_objdir_module_fix.diff
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
deleted file mode 100644
index 2640f57c2..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org>
-Index: sip4-qt3-4.10/siputils.py
-===================================================================
---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100
-+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100
-@@ -718,7 +718,8 @@
-
- libs.extend(self.optional_list("LIBS_WINDOWS"))
-
-- lflags.extend(self._platform_rpaths(rpaths.as_list()))
-+ # Don't append any rpaths
-+ #lflags.extend(self._platform_rpaths(rpaths.as_list()))
-
- # Save the transformed values.
- self.CFLAGS.set(cflags)
-@@ -843,6 +844,15 @@
- clib is the library name in cannonical form.
- framework is set of the library is implemented as a MacOS framework.
- """
-+ ##################################################################
-+ # Generally, the linker is intelligent enough not to need this #
-+ # additional information! #
-+ # And Qt4's pkg-config and prl files are broken #
-+ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> #
-+ ##################################################################
-+
-+ return []
-+
- prl_libs = []
-
- if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
deleted file mode 100644
index 3c4570b21..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: b/siputils.py
-===================================================================
---- a/siputils.py
-+++ b/siputils.py
-@@ -1547,9 +1547,12 @@
- mfile.write("\n$(OFILES): $(HFILES)\n")
-
- for mf in self._build["tqmoc_headers"].split():
-- root, discard = os.path.splitext(mf)
-+ root, _ = os.path.splitext(mf)
- cpp = "tqmoc_" + root + ".cpp"
-
-+ if self._src_dir != self.dir:
-+ mf = os.path.join(self._src_dir, mf)
-+
- mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
-
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 346d81ca0..7050c5431 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -115,11 +115,11 @@ 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
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
index 5aa6d22c1..a937df69a 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py
@@ -1,6 +1,10 @@
# import the sip_tqt_config.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:
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/tde-cmake/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/ubuntu/_base/dependencies/tde-cmake/debian/compat b/ubuntu/_base/dependencies/tde-cmake/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tde-cmake/debian/compat
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/control b/ubuntu/_base/dependencies/tde-cmake/debian/control
index 81aef4b41..54248affb 100644
--- a/ubuntu/_base/dependencies/tde-cmake/debian/control
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/control
@@ -2,7 +2,7 @@ Source: tde-cmake
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cmake (>= 3.5~)
Standards-Version: 3.8.4
Package: tde-cmake
diff --git a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqca/debian/compat b/ubuntu/_base/dependencies/tqca/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqca/debian/compat
+++ b/ubuntu/_base/dependencies/tqca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqca/debian/control b/ubuntu/_base/dependencies/tqca/debian/control
index 4fdc332c8..91abded59 100644
--- a/ubuntu/_base/dependencies/tqca/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqscintilla/debian/compat b/ubuntu/_base/dependencies/tqscintilla/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/compat
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control
index 976517047..0ce7442c2 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt3/debian/README.Debian
index e48fe37ea..6d5c135e2 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/README.Debian
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/compat b/ubuntu/_base/dependencies/tqt3/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/compat
+++ b/ubuntu/_base/dependencies/tqt3/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control
index b394a2f95..cfb831620 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/control
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install
new file mode 100644
index 000000000..eea094136
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
deleted file mode 100644
index d2bcbd7d6..000000000
--- a/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
index 92ebc61fb..fc421f516 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
index dbd9a5d19..59a51ee13 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs
index dbd9a5d19..59a51ee13 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index ddc008924..36a8cc408 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index d60b07fc7..43dc0a94a 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
index 72bd7093a..60fe91b77 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
index 56e0156b5..5975d4bb9 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
index f08fd0f02..2630a416c 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
@@ -1,2 +1,3 @@
FAQ
+README.md
README-QT.TXT
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/dependencies/tqtinterface/debian/compat b/ubuntu/_base/dependencies/tqtinterface/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/compat
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
index 18adefad7..88c437114 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/libraries/kipi-plugins/debian/compat b/ubuntu/_base/libraries/kipi-plugins/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/control b/ubuntu/_base/libraries/kipi-plugins/debian/control
index b8cda4910..fe82e6bff 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/control
+++ b/ubuntu/_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/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/libraries/libkdcraw/debian/compat b/ubuntu/_base/libraries/libkdcraw/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/compat
+++ b/ubuntu/_base/libraries/libkdcraw/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control
index 6390caa81..26cb1d4ef 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/libraries/libkexiv2/debian/compat b/ubuntu/_base/libraries/libkexiv2/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/compat
+++ b/ubuntu/_base/libraries/libkexiv2/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/control b/ubuntu/_base/libraries/libkexiv2/debian/control
index 5a26c0c5d..b0f951677 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/libraries/libkipi/debian/compat b/ubuntu/_base/libraries/libkipi/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libkipi/debian/compat
+++ b/ubuntu/_base/libraries/libkipi/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libkipi/debian/control b/ubuntu/_base/libraries/libkipi/debian/control
index b0e968151..ebbb57a7e 100644
--- a/ubuntu/_base/libraries/libkipi/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libksquirrel/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/libraries/libksquirrel/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libksquirrel/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_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/ubuntu/_base/libraries/libksquirrel/debian/compat b/ubuntu/_base/libraries/libksquirrel/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/compat
+++ b/ubuntu/_base/libraries/libksquirrel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/control b/ubuntu/_base/libraries/libksquirrel/debian/control
index e9b117bd0..cb02845da 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/control
+++ b/ubuntu/_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/ubuntu/_base/libraries/libksquirrel/debian/patches/series b/ubuntu/_base/libraries/libksquirrel/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/libraries/libksquirrel/debian/patches/series
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/rules b/ubuntu/_base/libraries/libksquirrel/debian/rules
index d761aa0a1..4453ef707 100755
--- a/ubuntu/_base/libraries/libksquirrel/debian/rules
+++ b/ubuntu/_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/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_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/ubuntu/_base/libraries/libtdeldap/debian/compat b/ubuntu/_base/libraries/libtdeldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/compat
+++ b/ubuntu/_base/libraries/libtdeldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/control b/ubuntu/_base/libraries/libtdeldap/debian/control
index e5baa5358..6c8ce3269 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/control
+++ b/ubuntu/_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, tde-cmake, 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/ubuntu/_base/libraries/libtqt-perl/debian/compat b/ubuntu/_base/libraries/libtqt-perl/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/libtqt-perl/debian/compat
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/control b/ubuntu/_base/libraries/libtqt-perl/debian/control
index 38d07566e..dbf0dcedb 100644
--- a/ubuntu/_base/libraries/libtqt-perl/debian/control
+++ b/ubuntu/_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/ubuntu/_base/libraries/pytde/debian/compat b/ubuntu/_base/libraries/pytde/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/pytde/debian/compat
+++ b/ubuntu/_base/libraries/pytde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/pytde/debian/control b/ubuntu/_base/libraries/pytde/debian/control
index a34b799f1..91db76761 100644
--- a/ubuntu/_base/libraries/pytde/debian/control
+++ b/ubuntu/_base/libraries/pytde/debian/control
@@ -4,7 +4,7 @@ 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, 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
+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
diff --git a/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
index 4536b9ff5..c12c20788 100644
--- a/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
+++ b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
@@ -1,11 +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 python-trinity-dbg not installed')
+ 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/ubuntu/_base/libraries/pytde/debian/rules b/ubuntu/_base/libraries/pytde/debian/rules
index bd0d34271..7f50df023 100755
--- a/ubuntu/_base/libraries/pytde/debian/rules
+++ b/ubuntu/_base/libraries/pytde/debian/rules
@@ -114,7 +114,7 @@ install-indep:
dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$'
for version in ${PYTHONS};\
do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\
+ 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;\
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/compat b/ubuntu/_base/libraries/pytdeextensions/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/control b/ubuntu/_base/libraries/pytdeextensions/debian/control
index e3e063583..96c600e70 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/control
+++ b/ubuntu/_base/libraries/pytdeextensions/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~), chrpath, quilt, tdelibs14-trinity, libtool-bin, libtool,
+Build-Depends: cdbs, debhelper (>= 10~), chrpath, quilt, tdelibs-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
diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/compat b/ubuntu/_base/metapackages/casper-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/casper-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/casper-trinity/debian/control b/ubuntu/_base/metapackages/casper-trinity/debian/control
index fb2167089..5971ee27b 100644
--- a/ubuntu/_base/metapackages/casper-trinity/debian/control
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/control
@@ -2,7 +2,7 @@ Source: casper-trinity
Section: misc
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
Standards-Version: 3.8.4
Package: casper-trinity
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/Makefile b/ubuntu/_base/metapackages/kubuntu-default-settings/Makefile
index 21080b3cd..21080b3cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/Makefile
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/Makefile
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kaccessrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/moderate-visual-impairment/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/background.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/head.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/head.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/head.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/amarok/stylesheet.css
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/amarok/stylesheet.css
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/edgyWallpaper.tar.gz
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1024x768.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
index 59160bb19..59160bb19 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1024x768.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x1024.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
index 4e2bce26e..4e2bce26e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x1024.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x800.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
index 68815abac..68815abac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1280x800.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1440x900.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
index 3e44742a4..3e44742a4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1440x900.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1600x1200.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
index f6166c447..f6166c447 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1600x1200.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1080.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
index 8902b4dfa..8902b4dfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1080.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1200.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/intrepid_wallpapers/Air/1920x1200.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/index.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/index.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/index.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_admin.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_admin.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_away.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_away.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_away.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_halfop.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_halfop.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_op.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_op.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_op.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_owner.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_owner.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/konversation/irc_voice.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/konversation/irc_voice.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Dialog.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Preview.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
index 47b686406..47b686406 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Theme.rc
index 913cbfbe8..913cbfbe8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/Theme.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/Theme.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/ksplash/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/ksplash/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side-tile.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-kmenu-side.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background-classic.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-konqueror-background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-login.ogg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-login.ogg
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-panel.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-panel.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-panel.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
index 8ace65f4f..8ace65f4f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/kubuntu-wallpaper.png.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/background.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/background.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/background.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/default.css b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/default.css
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/default.css
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/head.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/head.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/head.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/layout.html b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/metabar/layout.html
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/metabar/layout.html
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
index 3e4862941..3e4862941 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
index d8fbd800f..d8fbd800f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
index e6b628f3c..e6b628f3c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
index bd4437f97..bd4437f97 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
index 085ef86b7..085ef86b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/kubuntu.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/kubuntu.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme-cartoon/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
index 440bf6f43..440bf6f43 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Dialog.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index 10ce5cc52..10ce5cc52 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Makefile.am b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
index 078e370a5..078e370a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/Makefile.am
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enter_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enterprise.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
index cf8aecd32..cf8aecd32 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/enterprise.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/gpl.txt
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/preview.png
index f7712d7d2..f7712d7d2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/preview.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/preview.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_normal.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_over.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_over.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/tdm-theme/system_pressed.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/16x16/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/22x22/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/32x32/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0001.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0002.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0003.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0004.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0005.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0006.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0007.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0008.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0009.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0010.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0011.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0012.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0013.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0014.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0015.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0016.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0017.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0018.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0019.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0020.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0021.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0022.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0023.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0024.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0025.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0026.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0027.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0028.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0029.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0030.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0031.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0032.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0033.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0034.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0035.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0036.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0037.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0038.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0039.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0040.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0041.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0042.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0043.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0044.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0045.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0046.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0047.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0048.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0049.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0050.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0051.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0052.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0053.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0054.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0055.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0056.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0057.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0058.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0059.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0060.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0061.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0062.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0063.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0064.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0065.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0066.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0067.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0068.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0069.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0070.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0071.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/kubuntu-0072.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/48x48/trinity.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/gear.3ds b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/throbber/gear.3ds
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/throbber/gear.3ds
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient-inactive.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/artwork/window-decoration-gradient.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/artwork/window-decoration-gradient.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/backgroundrc b/ubuntu/_base/metapackages/kubuntu-default-settings/backgroundrc
index ca9ca66bb..ca9ca66bb 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/backgroundrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/backgroundrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
index d710e7edf..d710e7edf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/colour-schemes/kubuntuColours.kcsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/X_cursor
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_down
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/base_arrow_up
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_down
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/based_arrow_up
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/bottom_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/center_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/circle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/copy
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/cross_reverse
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crossed_circle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/crosshair
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dot
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/dotbox
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_large
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draft_small
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/draped_box
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/fleur
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/h_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand1
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2 b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/hand2
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/left_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/link
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/link
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/ll_angle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/lr_angle
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/move
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/move
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pencil
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/pirate
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/plus
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/question_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_ptr
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/right_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/tcross
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_left_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_right_corner
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/top_side
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/v_double_arrow
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/watch
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/index.theme b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/cursors/index.theme
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/cursors/index.theme
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
index a67cc83c9..6cbdc9f2b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
@@ -2,7 +2,7 @@ Source: kubuntu-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: kubuntu-default-settings-trinity
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/.gitignore
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index 77e73faf8..77e73faf8 100755
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
index 6bc424f8e..6bc424f8e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/gtk-qt-engine-rc-files/gtkrc-2.0-kde
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/metapackages/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
index 105c4f692..105c4f692 120000
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen128.png b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen128.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen128.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen64.png b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kaffeine/fileopen64.png
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/fileopen64.png
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-home b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-home
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-home
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/directory-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/directory-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/hidden-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-hidden/hidden-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-hidden/hidden-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_managerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_managerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/adept_notifierrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/adept_notifierrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/amarokrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/amarokrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/amarokrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/arkrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/arkrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/arkrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
index e54b81f63..e54b81f63 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/cryptodefaults
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/d3lphinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/d3lphinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3b.eventsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3brc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/k3brc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/k3brc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kaffeinerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kaffeinerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katapultrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katapultrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katapultrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/katerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/katerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kbookmarkrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kbookmarkrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmlaptoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
index a0209401b..a0209401b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdeglobals
index 502972019..502972019 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdesktoprc
index 41ae7dfb3..41ae7dfb3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kdesktoprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kgpgrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kgpgrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kgpgrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/khelpcenterrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/khelpcenterrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kickerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kickerrc
index eaab006e6..eaab006e6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kickerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kickerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/klipperrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/klipperrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/klipperrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmailrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmailrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmailrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmixrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmixrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmixrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kmplayerrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kmplayerrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knemorc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knemorc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knemorc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotesrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotesrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotesrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konqiconviewrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konqiconviewrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konquerorrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konquerorrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konquerorrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konsolerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konsolerc
index 2e4e63301..2e4e63301 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konsolerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konsolerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kontactrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kontactrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kontactrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konversationrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/konversationrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/konversationrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kopeterc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kopeterc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kopeterc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/korgacrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/korgacrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/korgacrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kscdrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kscdrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kscdrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ksplashrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ksplashrc
index b9b3b4707..b9b3b4707 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ksplashrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ksplashrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ktiprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/ktiprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/ktiprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuriikwsfilterrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuserrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/kuserrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/kuserrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
index e31c7d266..e31c7d266 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/metabarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/metabarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/metabarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/profilerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/profilerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/profilerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/skimrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/skimrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/skimrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdelaunchrc
index ac8e4ce06..ac8e4ce06 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdelaunchrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/tdewalletrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twincrystalrc
index 14134537d..14134537d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twincrystalrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twincrystalrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twinrc
index bf263a870..bf263a870 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/twinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/twinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/uiserver b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/uiserver
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/uiserver
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/yakuakerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde-rc-files/yakuakerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde-rc-files/yakuakerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/CHANGELOG
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/INSTALL
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/LICENSE
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/colors
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/down.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/news/up.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/theme.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-home
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-home
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/directory-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/directory-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-hidden/hidden-media
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-hidden/hidden-media
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/dolphinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/katerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/katerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
index 08ce6c33e..08ce6c33e 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kmixrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/ktiprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kuserrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/kwinrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kde4/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
index 96e6b3c15..96e6b3c15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml b/ubuntu/_base/metapackages/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/konqueror-profile/konq_plugins.xml
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-plugins/dirfilterplugin.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/gvimagepart.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/ksvgplugin.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/part.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/part.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/part.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/kpart-rc-files/tdehtml_browser.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-7z.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-7z.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-7z.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-ace.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-ace.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-ace.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arc.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arc.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arc.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-archive.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-archive.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-archive.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arj.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-arj.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-arj.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-bzip2.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-bzip2.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-compress.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-compress.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-compress.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-cpio.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-cpio.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-gzip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-gzip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lha.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lha.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lha.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-lzop.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-lzop.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-pak.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-pak.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-pak.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-rar.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-rar.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-rar.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tar.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tar.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tar.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tarz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tarz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tbz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tbz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tgz.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tgz.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-tzo.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-tzo.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zip.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zip.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zip.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/mimelnk/x-zoo.desktop
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/mimelnk/x-zoo.desktop
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/kstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/kstylerc
index 6c639810f..6c639810f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/kstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/kstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/lipstikstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/lipstikstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qt-rc-files/polyesterstylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qt-rc-files/polyesterstylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc b/ubuntu/_base/metapackages/kubuntu-default-settings/qtcurve-rc-files/stylerc
index 73c2faa15..73c2faa15 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/qtcurve-rc-files/stylerc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/qtcurve-rc-files/stylerc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/kde4rc b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/kde4rc
index d08a1fe0b..d08a1fe0b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/kde4rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tde-user-profile b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tde-user-profile
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tderc b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tderc
index 8bb08502d..8bb08502d 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tde-profile/tderc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tde-profile/tderc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl b/ubuntu/_base/metapackages/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdewallet-default-wallet/tdewallet.kwl
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
Binary files differ
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/_base/metapackages/kubuntu-default-settings/tdmdistrc
index 65425be5f..65425be5f 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/tdmdistrc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/tdmdistrc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/gwenviewui.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/konqueror.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/konqueror.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/distrospecific/ui-rc-files/kopetechatwindow.rc
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/control b/ubuntu/_base/metapackages/kubuntu-meta/debian/control
index a3b436fe6..97afd7339 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-meta/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: debhelper (>= 9~)
+Build-Depends: debhelper (>= 10~)
Package: kubuntu-desktop-trinity
Architecture: any
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 5a651c331..677f30fee 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
@@ -321,8 +321,3 @@ to compile a driver. -mdz
# * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent)
* (landscape-client)
* readahead
-
-= Germinate workarounds =
-
- * libglut3 # depended upon by freeglut3
- * libgl1-mesa-glx # depended upon by freeglut3
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
index 1442b10be..109fbe1b8 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
@@ -38,8 +38,6 @@ ksvg-trinity
ksystemlog-trinity
lftp
libarts1-akode-trinity
-libgl1-mesa-glx
-libglut3 | freeglut3
libsasl2-modules
libtqt-perl
openprinting-ppds
diff --git a/ubuntu/_base/metapackages/trinity-livecd/debian/compat b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/trinity-livecd/debian/compat
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/trinity-livecd/debian/control b/ubuntu/_base/metapackages/trinity-livecd/debian/control
index 5db45e692..dbc04c749 100644
--- a/ubuntu/_base/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/_base/metapackages/trinity-livecd/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-livecd
Architecture: all
diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/metapackages/ubiquity-trinity/debian/control b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
index 4db5384c2..8de47d41a 100644
--- a/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
@@ -2,7 +2,7 @@ Source: ubiquity-trinity
Section: admin
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~)
+Build-Depends: cdbs, debhelper (>= 10~)
Standards-Version: 3.8.4
Package: ubiquity-trinity
diff --git a/ubuntu/hirsute b/ubuntu/lunar
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/hirsute
+++ b/ubuntu/lunar
diff --git a/ubuntu/impish b/ubuntu/mantic
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/impish
+++ b/ubuntu/mantic
diff --git a/ubuntu/xenial b/ubuntu/noble
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/xenial
+++ b/ubuntu/noble