summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/PKGBUILD.template14
-rwxr-xr-xarch/build.sh8
-rw-r--r--arch/tde-base/tde-i18n/PKGBUILD148
-rw-r--r--arch/tde-base/tde-polkit-agent-tde/PKGBUILD60
-rw-r--r--arch/tde-base/tde-tdeadmin/PKGBUILD36
-rw-r--r--arch/tde-base/tde-tdeartwork/PKGBUILD37
-rw-r--r--arch/tde-base/tde-tdebindings/PKGBUILD26
-rw-r--r--arch/tde-base/tde-tdebindings/bp000-817f960e.diff31
-rw-r--r--arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff401
-rw-r--r--arch/tde-base/tde-tdebindings/bp002-33697c89.diff24
-rw-r--r--arch/tde-base/tde-tdegraphics/PKGBUILD57
-rw-r--r--arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff33
-rw-r--r--arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff81
-rw-r--r--arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff63
-rw-r--r--arch/tde-base/tde-tdeutils/PKGBUILD36
-rw-r--r--arch/tde-core/tde-arts/PKGBUILD40
-rw-r--r--arch/tde-core/tde-avahi-tqt/PKGBUILD32
-rw-r--r--arch/tde-core/tde-cmake-trinity/PKGBUILD51
-rw-r--r--arch/tde-core/tde-dbus-1-tqt/PKGBUILD36
-rw-r--r--arch/tde-core/tde-dbus-tqt/PKGBUILD33
-rw-r--r--arch/tde-core/tde-libart-lgpl/PKGBUILD23
-rw-r--r--arch/tde-core/tde-polkit-tqt/PKGBUILD49
-rw-r--r--arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install12
-rw-r--r--arch/tde-core/tde-tdebase/PKGBUILD52
-rw-r--r--arch/tde-core/tde-tdelibs/PKGBUILD37
-rw-r--r--arch/tde-core/tde-tqca-tls/PKGBUILD38
-rw-r--r--arch/tde-core/tde-tqca/PKGBUILD54
-rw-r--r--arch/tde-core/tde-tqt3/PKGBUILD28
-rw-r--r--arch/tde-core/tde-tqt3/bp000-fix-build-key.diff21
-rw-r--r--arch/tde-core/tde-tqtinterface/PKGBUILD43
-rw-r--r--arch/tde-core/tde-tqtinterface/tqtpc-location.patch11
-rw-r--r--arch/tde-devel/tde-tdesdk/PKGBUILD33
-rw-r--r--arch/tde-devel/tde-tdevelop/PKGBUILD38
-rw-r--r--arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff1238
-rw-r--r--arch/tde-devel/tde-tdewebdev/PKGBUILD36
-rw-r--r--arch/tde-extra/tde-abakus/PKGBUILD17
-rw-r--r--arch/tde-extra/tde-akode/PKGBUILD54
-rw-r--r--arch/tde-extra/tde-akode/tde-akode.install11
-rw-r--r--arch/tde-extra/tde-amarok/PKGBUILD53
-rw-r--r--arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff28
-rw-r--r--arch/tde-extra/tde-basket/PKGBUILD17
-rw-r--r--arch/tde-extra/tde-gtk-qt-engine/PKGBUILD34
-rw-r--r--arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD28
-rw-r--r--arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff32
-rw-r--r--arch/tde-extra/tde-kile/PKGBUILD61
-rw-r--r--arch/tde-extra/tde-kmplayer/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-kmymoney/PKGBUILD61
-rw-r--r--arch/tde-extra/tde-krusader/PKGBUILD22
-rw-r--r--arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD34
-rw-r--r--arch/tde-extra/tde-style-domino/PKGBUILD59
-rw-r--r--arch/tde-extra/tde-style-qtcurve/PKGBUILD29
-rw-r--r--arch/tde-extra/tde-systemsettings/PKGBUILD29
-rw-r--r--arch/tde-extra/tde-tdeaccessibility/PKGBUILD36
-rw-r--r--arch/tde-extra/tde-tdeaddons/PKGBUILD38
-rw-r--r--arch/tde-extra/tde-tdeedu/PKGBUILD45
-rw-r--r--arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff31
-rw-r--r--arch/tde-extra/tde-tdegames/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-tdemultimedia/PKGBUILD39
-rw-r--r--arch/tde-extra/tde-tdenetwork/PKGBUILD50
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/PKGBUILD41
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff78
-rw-r--r--arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff121
-rw-r--r--arch/tde-extra/tde-tdepim/PKGBUILD31
-rw-r--r--arch/tde-extra/tde-tdepowersave/PKGBUILD31
-rw-r--r--arch/tde-extra/tde-tdesudo/PKGBUILD37
-rw-r--r--arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff31
-rw-r--r--arch/tde-extra/tde-tdetoys/PKGBUILD33
-rw-r--r--arch/tde-extra/tde-tdmtheme/PKGBUILD32
-rw-r--r--arch/tde-extra/tde-tork/PKGBUILD26
-rw-r--r--arch/tde-extra/tde-tork/bp000-7576a4bf.diff31
-rw-r--r--arch/tde-extra/tde-twin-style-crystal/PKGBUILD68
-rw-r--r--arch/tde-extra/tde-yakuake/PKGBUILD19
-rw-r--r--arch/tde-libs/tde-libcaldav/PKGBUILD31
-rw-r--r--arch/tde-libs/tde-libcarddav/PKGBUILD30
-rw-r--r--arch/tde-libs/tde-libkdcraw/PKGBUILD75
-rw-r--r--arch/tde-libs/tde-libkexiv2/PKGBUILD36
-rw-r--r--arch/tde-meta/PKGBUILD13
-rw-r--r--debian/_base/applications/development/ktechlab/debian/docs3
-rw-r--r--debian/_base/applications/development/kxmleditor/debian/docs2
-rw-r--r--debian/_base/applications/internet/kftpgrabber/debian/docs2
-rw-r--r--debian/_base/applications/internet/kopete-otr/debian/docs2
-rw-r--r--debian/_base/applications/internet/tork/debian/docs2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/control28
-rw-r--r--debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rwxr-xr-xdebian/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--debian/_base/applications/multimedia/k3b/debian/control3
-rw-r--r--debian/_base/applications/office/kile/debian/control2
-rw-r--r--debian/_base/applications/office/kile/debian/patches/series (renamed from debian/_base/applications/settings/knetworkmanager8/debian/patches/series)0
-rwxr-xr-xdebian/_base/applications/office/kile/debian/rules73
-rw-r--r--debian/_base/applications/office/kile/debian/watch2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/control2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xdebian/_base/applications/office/kmymoney/debian/rules43
-rw-r--r--debian/_base/applications/office/kmymoney/debian/watch2
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/README.source3
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/changelog373
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/control37
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/copyright34
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1145
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/manpages1
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/menu6
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides2
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst16
-rwxr-xr-xdebian/_base/applications/settings/knetworkmanager8/debian/rules24
-rw-r--r--debian/_base/applications/settings/knetworkmanager8/debian/watch2
-rw-r--r--debian/_base/applications/system/kpowersave/debian/changelog372
-rw-r--r--debian/_base/applications/system/kpowersave/debian/control42
-rw-r--r--debian/_base/applications/system/kpowersave/debian/copyright28
-rw-r--r--debian/_base/applications/system/kpowersave/debian/install1
-rw-r--r--debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda4
-rw-r--r--debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian5
-rw-r--r--debian/_base/applications/system/kpowersave/debian/kpowersave.xpm628
-rw-r--r--debian/_base/applications/system/kpowersave/debian/menu7
-rw-r--r--debian/_base/applications/system/kpowersave/debian/postinst13
-rw-r--r--debian/_base/applications/system/kpowersave/debian/postrm26
-rw-r--r--debian/_base/applications/system/kpowersave/debian/preinst39
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk (renamed from debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk)0
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl (renamed from debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl)0
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/changelog67
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/compat (renamed from debian/_base/applications/settings/knetworkmanager8/debian/compat)0
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/control25
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/copyright52
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/docs2
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/patches/series (renamed from debian/_base/applications/system/kpowersave/debian/patches/series)0
-rwxr-xr-xdebian/_base/applications/system/polkit-agent-tde/debian/rules (renamed from ubuntu/_base/applications/system/kpowersave/debian/rules)8
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/source/format (renamed from debian/_base/applications/settings/knetworkmanager8/debian/source/format)0
-rw-r--r--debian/_base/applications/system/polkit-agent-tde/debian/source/options (renamed from debian/_base/applications/settings/knetworkmanager8/debian/source/options)0
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk (renamed from debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk)0
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl (renamed from debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl)0
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog6
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/compat (renamed from debian/_base/applications/system/kpowersave/debian/compat)0
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/control16
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright11
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series)0
-rwxr-xr-xdebian/_base/applications/tdeio/tdeio-appinfo/debian/rules24
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format (renamed from debian/_base/applications/system/kpowersave/debian/source/format)0
-rw-r--r--debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options (renamed from debian/_base/applications/system/kpowersave/debian/source/options)0
-rw-r--r--debian/_base/applications/themes/tde-style-ia-ora/debian/docs2
-rw-r--r--debian/_base/applications/themes/twin-style-crystal/debian/docs3
-rw-r--r--debian/_base/applications/utilities/qalculate-tde/debian/docs2
-rw-r--r--debian/_base/common/cmake/debian/control2
-rw-r--r--debian/_base/core/tdebase/debian/control6
-rw-r--r--debian/_base/core/tdebase/debian/kappfinder-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/kappfinder-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/kate-trinity.install2
-rw-r--r--debian/_base/core/tdebase/debian/kate-trinity.manpages2
-rw-r--r--debian/_base/core/tdebase/debian/kfind-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/kfind-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/kicker-trinity.install4
-rw-r--r--debian/_base/core/tdebase/debian/kicker-trinity.manpages4
-rw-r--r--debian/_base/core/tdebase/debian/kmenuedit-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/konqueror-trinity.install3
-rw-r--r--debian/_base/core/tdebase/debian/konqueror-trinity.manpages3
-rw-r--r--debian/_base/core/tdebase/debian/konqueror-trinity.postinst2
-rw-r--r--debian/_base/core/tdebase/debian/konsole-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/konsole-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/konsole-trinity.postinst2
-rw-r--r--debian/_base/core/tdebase/debian/kpager-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/kpager-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/kpersonalizer-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/ksmserver-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/ksmserver-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--debian/_base/core/tdebase/debian/man/appletproxy-trinity.1163
-rw-r--r--debian/_base/core/tdebase/debian/man/drkonqi-trinity.1175
-rw-r--r--debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1163
-rw-r--r--debian/_base/core/tdebase/debian/man/gentdmconf-trinity.191
-rw-r--r--debian/_base/core/tdebase/debian/man/kappfinder-trinity.154
-rw-r--r--debian/_base/core/tdebase/debian/man/kasbar-trinity.1148
-rw-r--r--debian/_base/core/tdebase/debian/man/kate-trinity.183
-rw-r--r--debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1156
-rw-r--r--debian/_base/core/tdebase/debian/man/kcheckpass-trinity.149
-rw-r--r--debian/_base/core/tdebase/debian/man/kcminit-trinity.1153
-rw-r--r--debian/_base/core/tdebase/debian/man/kdcop-trinity.1159
-rw-r--r--debian/_base/core/tdebase/debian/man/kdialog-trinity.1209
-rw-r--r--debian/_base/core/tdebase/debian/man/keditbookmarks-trinity.1181
-rw-r--r--debian/_base/core/tdebase/debian/man/kfind-trinity.158
-rw-r--r--debian/_base/core/tdebase/debian/man/kfmclient-trinity.1222
-rw-r--r--debian/_base/core/tdebase/debian/man/khotkeys-trinity.1150
-rw-r--r--debian/_base/core/tdebase/debian/man/kicker-trinity.1171
-rw-r--r--debian/_base/core/tdebase/debian/man/kjobviewer-trinity.1202
-rw-r--r--debian/_base/core/tdebase/debian/man/kmenuedit-trinity.151
-rw-r--r--debian/_base/core/tdebase/debian/man/knetattach-trinity.1164
-rw-r--r--debian/_base/core/tdebase/debian/man/konqueror-trinity.1245
-rw-r--r--debian/_base/core/tdebase/debian/man/konsole-trinity.1179
-rw-r--r--debian/_base/core/tdebase/debian/man/kpager-trinity.153
-rw-r--r--debian/_base/core/tdebase/debian/man/kpersonalizer-trinity.166
-rw-r--r--debian/_base/core/tdebase/debian/man/kprinter-trinity.1209
-rw-r--r--debian/_base/core/tdebase/debian/man/krandom.kss-trinity.1152
-rw-r--r--debian/_base/core/tdebase/debian/man/kreadconfig-trinity.1173
-rw-r--r--debian/_base/core/tdebase/debian/man/krootimage-trinity.1151
-rw-r--r--debian/_base/core/tdebase/debian/man/kstart-trinity.1215
-rw-r--r--debian/_base/core/tdebase/debian/man/ksystraycmd-trinity.1189
-rw-r--r--debian/_base/core/tdebase/debian/man/ktrash-trinity.1155
-rw-r--r--debian/_base/core/tdebase/debian/man/kwrite-trinity.160
-rw-r--r--debian/_base/core/tdebase/debian/man/kwriteconfig-trinity.1173
-rw-r--r--debian/_base/core/tdebase/debian/man/kxkb-trinity.1163
-rw-r--r--debian/_base/core/tdebase/debian/man/starttde-trinity.146
-rw-r--r--debian/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1200
-rw-r--r--debian/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1163
-rw-r--r--debian/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.122
-rw-r--r--debian/_base/core/tdebase/debian/man/tdepasswd-trinity.1169
-rw-r--r--debian/_base/core/tdebase/debian/man/tdeprintfax-trinity.1160
-rw-r--r--debian/_base/core/tdebase/debian/man/tdesu-trinity.1102
-rw-r--r--debian/_base/core/tdebase/debian/man/tdm-trinity.1116
-rw-r--r--debian/_base/core/tdebase/debian/man/tdm_config-trinity.122
-rw-r--r--debian/_base/core/tdebase/debian/man/tdm_greet-trinity.122
-rw-r--r--debian/_base/core/tdebase/debian/man/tdmctl-trinity.1220
-rwxr-xr-xdebian/_base/core/tdebase/debian/rules1
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install2
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages2
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.install17
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.manpages17
-rw-r--r--debian/_base/core/tdebase/debian/tdepasswd-trinity.install1
-rw-r--r--debian/_base/core/tdebase/debian/tdepasswd-trinity.manpages1
-rw-r--r--debian/_base/core/tdebase/debian/tdeprint-trinity.install3
-rw-r--r--debian/_base/core/tdebase/debian/tdeprint-trinity.manpages3
-rw-r--r--debian/_base/core/tdebase/debian/tdm-trinity.install6
-rw-r--r--debian/_base/core/tdebase/debian/tdm-trinity.manpages6
-rw-r--r--debian/_base/core/tdebindings/debian/control2
-rw-r--r--debian/_base/core/tdegraphics/debian/control6
-rw-r--r--debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install1
-rw-r--r--debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install2
-rw-r--r--debian/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install1
-rwxr-xr-xdebian/_base/core/tdegraphics/debian/rules4
-rw-r--r--debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install2
-rw-r--r--debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install15
-rw-r--r--debian/_base/core/tdelibs/debian/tdelibs14-trinity.install2
-rw-r--r--debian/_base/core/tdetoys/debian/kweather-trinity.install9
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk)0
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl)0
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/changelog66
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/compat (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/compat)0
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/control61
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/copyright101
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/docs1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install31
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install8
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install1
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/patches/series (renamed from ubuntu/_base/applications/system/kpowersave/debian/patches/series)0
-rwxr-xr-xdebian/_base/dependencies/polkit-tqt/debian/rules23
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/source/format (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format)0
-rw-r--r--debian/_base/dependencies/polkit-tqt/debian/source/options (renamed from ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options)0
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install3
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides23
-rwxr-xr-xdebian/_base/dependencies/python-tqt/debian/rules12
-rw-r--r--debian/_base/dependencies/python-tqt/debian/watch3
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/control69
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xdebian/_base/dependencies/sip4-tqt/debian/rules64
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--debian/_base/dependencies/sip4-tqt/debian/watch3
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk (renamed from ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk)0
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl (renamed from ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl)0
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/control21
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/dirs2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/docs1
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xdebian/_base/dependencies/tqscintilla/debian/rules129
-rwxr-xr-xdebian/_base/dependencies/tqtinterface/debian/rules9
-rw-r--r--debian/_base/libraries/libkdcraw/debian/docs3
-rwxr-xr-xdebian/_base/libraries/libtqt-perl/debian/rules1
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs2
-rw-r--r--debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rwxr-xr-xdebian/_base/libraries/python-trinity/debian/rules4
-rw-r--r--debian/_base/libraries/python-trinity/debian/watch3
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm3
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm3
-rw-r--r--debian/_base/metapackages/synaptic-trinity/debian/postrm2
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh9
-rw-r--r--debian/_buildscripts/local/additional_files/etc/pbuilderrc40
-rwxr-xr-xdebian/_buildscripts/local/build_module.sh2
-rw-r--r--debian/_buildscripts/local/internals/distro_list.txt10
-rw-r--r--dilos/common/cmake/debian/control2
-rw-r--r--dilos/core/tdebase/debian/control4
-rw-r--r--dilos/core/tdebase/debian/kappfinder-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/kappfinder-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/kate-trinity.install2
-rw-r--r--dilos/core/tdebase/debian/kate-trinity.manpages2
-rw-r--r--dilos/core/tdebase/debian/kfind-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/kfind-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/kicker-trinity.install4
-rw-r--r--dilos/core/tdebase/debian/kicker-trinity.manpages4
-rw-r--r--dilos/core/tdebase/debian/kmenuedit-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/kmenuedit-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/konqueror-trinity.install3
-rw-r--r--dilos/core/tdebase/debian/konqueror-trinity.manpages3
-rw-r--r--dilos/core/tdebase/debian/konqueror-trinity.postinst2
-rw-r--r--dilos/core/tdebase/debian/konsole-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/konsole-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/konsole-trinity.postinst2
-rw-r--r--dilos/core/tdebase/debian/kpager-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/kpager-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/kpersonalizer-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/kpersonalizer-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/ksmserver-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/ksmserver-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--dilos/core/tdebase/debian/man/appletproxy-trinity.1163
-rw-r--r--dilos/core/tdebase/debian/man/drkonqi-trinity.1175
-rw-r--r--dilos/core/tdebase/debian/man/extensionproxy-trinity.1163
-rw-r--r--dilos/core/tdebase/debian/man/gentdmconf-trinity.191
-rw-r--r--dilos/core/tdebase/debian/man/kappfinder-trinity.154
-rw-r--r--dilos/core/tdebase/debian/man/kasbar-trinity.1148
-rw-r--r--dilos/core/tdebase/debian/man/kate-trinity.183
-rw-r--r--dilos/core/tdebase/debian/man/kblankscrn.kss-trinity.1156
-rw-r--r--dilos/core/tdebase/debian/man/kcheckpass-trinity.149
-rw-r--r--dilos/core/tdebase/debian/man/kcminit-trinity.1153
-rw-r--r--dilos/core/tdebase/debian/man/kdcop-trinity.1159
-rw-r--r--dilos/core/tdebase/debian/man/kdialog-trinity.1209
-rw-r--r--dilos/core/tdebase/debian/man/keditbookmarks-trinity.1181
-rw-r--r--dilos/core/tdebase/debian/man/kfind-trinity.158
-rw-r--r--dilos/core/tdebase/debian/man/kfmclient-trinity.1222
-rw-r--r--dilos/core/tdebase/debian/man/khotkeys-trinity.1150
-rw-r--r--dilos/core/tdebase/debian/man/kicker-trinity.1171
-rw-r--r--dilos/core/tdebase/debian/man/kjobviewer-trinity.1202
-rw-r--r--dilos/core/tdebase/debian/man/kmenuedit-trinity.151
-rw-r--r--dilos/core/tdebase/debian/man/knetattach-trinity.1164
-rw-r--r--dilos/core/tdebase/debian/man/konqueror-trinity.1245
-rw-r--r--dilos/core/tdebase/debian/man/konsole-trinity.1179
-rw-r--r--dilos/core/tdebase/debian/man/kpager-trinity.153
-rw-r--r--dilos/core/tdebase/debian/man/kpersonalizer-trinity.166
-rw-r--r--dilos/core/tdebase/debian/man/kprinter-trinity.1209
-rw-r--r--dilos/core/tdebase/debian/man/krandom.kss-trinity.1152
-rw-r--r--dilos/core/tdebase/debian/man/kreadconfig-trinity.1173
-rw-r--r--dilos/core/tdebase/debian/man/krootimage-trinity.1151
-rw-r--r--dilos/core/tdebase/debian/man/kstart-trinity.1215
-rw-r--r--dilos/core/tdebase/debian/man/ksystraycmd-trinity.1189
-rw-r--r--dilos/core/tdebase/debian/man/ktrash-trinity.1155
-rw-r--r--dilos/core/tdebase/debian/man/kwrite-trinity.160
-rw-r--r--dilos/core/tdebase/debian/man/kwriteconfig-trinity.1173
-rw-r--r--dilos/core/tdebase/debian/man/kxkb-trinity.1163
-rw-r--r--dilos/core/tdebase/debian/man/starttde-trinity.146
-rw-r--r--dilos/core/tdebase/debian/man/tdedebugdialog-trinity.1200
-rw-r--r--dilos/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1163
-rw-r--r--dilos/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.122
-rw-r--r--dilos/core/tdebase/debian/man/tdepasswd-trinity.1169
-rw-r--r--dilos/core/tdebase/debian/man/tdeprintfax-trinity.1160
-rw-r--r--dilos/core/tdebase/debian/man/tdesu-trinity.1102
-rw-r--r--dilos/core/tdebase/debian/man/tdm-trinity.1116
-rw-r--r--dilos/core/tdebase/debian/man/tdm_config-trinity.122
-rw-r--r--dilos/core/tdebase/debian/man/tdm_greet-trinity.122
-rw-r--r--dilos/core/tdebase/debian/man/tdmctl-trinity.1220
-rwxr-xr-xdilos/core/tdebase/debian/rules1
-rw-r--r--dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install2
-rw-r--r--dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages2
-rw-r--r--dilos/core/tdebase/debian/tdebase-trinity-bin.install17
-rw-r--r--dilos/core/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--dilos/core/tdebase/debian/tdebase-trinity-bin.manpages17
-rw-r--r--dilos/core/tdebase/debian/tdepasswd-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/tdepasswd-trinity.manpages1
-rw-r--r--dilos/core/tdebase/debian/tdeprint-trinity.install3
-rw-r--r--dilos/core/tdebase/debian/tdeprint-trinity.manpages3
-rw-r--r--dilos/core/tdebase/debian/tdm-trinity.install6
-rw-r--r--dilos/core/tdebase/debian/tdm-trinity.manpages6
-rw-r--r--dilos/core/tdebindings/debian/control2
-rw-r--r--dilos/core/tdegraphics/debian/control6
-rw-r--r--dilos/core/tdegraphics/debian/libkscan-dev-trinity.install1
-rw-r--r--dilos/core/tdegraphics/debian/libkscan-trinity-dev.install2
-rw-r--r--dilos/core/tdegraphics/debian/libpoppler-tqt-dev.install1
-rwxr-xr-xdilos/core/tdegraphics/debian/rules4
-rw-r--r--dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install2
-rw-r--r--dilos/core/tdelibs/debian/tdelibs-data-trinity.install15
-rw-r--r--dilos/core/tdelibs/debian/tdelibs14-trinity.install2
-rw-r--r--dilos/core/tdetoys/debian/kweather-trinity.install9
-rwxr-xr-xdilos/dependencies/python-tqt/debian/rules6
-rw-r--r--dilos/dependencies/sip4-tqt/debian/control69
-rw-r--r--dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from dilos/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xdilos/dependencies/sip4-tqt/debian/rules64
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py13
-rw-r--r--dilos/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--dilos/dependencies/sip4-tqt/debian/watch3
-rw-r--r--dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--dilos/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--dilos/dependencies/tqscintilla/debian/control19
-rw-r--r--dilos/dependencies/tqscintilla/debian/dirs2
-rw-r--r--dilos/dependencies/tqscintilla/debian/docs1
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--dilos/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xdilos/dependencies/tqscintilla/debian/rules131
m---------gentoo0
l---------raspbian/raspbian-bookworm1
l---------raspbian/raspbian-stretch1
-rw-r--r--redhat/Makefile53
-rw-r--r--redhat/applications/abakus/abakus.spec2
-rw-r--r--redhat/applications/amarok/amarok.spec23
-rw-r--r--redhat/applications/basket/basket.spec2
-rw-r--r--redhat/applications/codeine/codeine.spec4
-rw-r--r--redhat/applications/digikam/digikam.spec2
-rw-r--r--redhat/applications/dolphin/dolphin.spec2
-rw-r--r--redhat/applications/filelight/filelight.spec2
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine.spec2
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n.spec2
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n.spec2
-rw-r--r--redhat/applications/k3b/k3b.spec6
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec47
-rw-r--r--redhat/applications/kaffeine/kaffeine.spec4
-rw-r--r--redhat/applications/kasablanca/kasablanca.spec4
-rw-r--r--redhat/applications/katapult/katapult.spec2
-rw-r--r--redhat/applications/kbarcode/kbarcode.spec2
-rw-r--r--redhat/applications/kbfx/kbfx.spec3
-rw-r--r--redhat/applications/kbibtex/kbibtex.spec4
-rw-r--r--redhat/applications/kbiff/kbiff.spec4
-rw-r--r--redhat/applications/kbookreader/kbookreader.spec2
-rw-r--r--redhat/applications/kchmviewer/kchmviewer.spec4
-rw-r--r--redhat/applications/kcmautostart/kcmautostart.spec4
-rw-r--r--redhat/applications/kcmldap/kcmldap.spec2
-rw-r--r--redhat/applications/kcmldapcontroller/kcmldapcontroller.spec2
-rw-r--r--redhat/applications/kcmldapmanager/kcmldapmanager.spec2
-rw-r--r--redhat/applications/kcpuload/kcpuload.spec2
-rw-r--r--redhat/applications/kdbg/kdbg.spec3
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification.spec2
-rw-r--r--redhat/applications/kdiff3/kdiff3.spec2
-rw-r--r--redhat/applications/kdirstat/kdirstat.spec2
-rw-r--r--redhat/applications/keep/keep.spec2
-rw-r--r--redhat/applications/kerberostray/kerberostray.spec2
-rw-r--r--redhat/applications/keximdb/keximdb.spec2
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber.spec51
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3.spec3
-rw-r--r--redhat/applications/kima/kima.spec4
-rw-r--r--redhat/applications/kiosktool/kiosktool.spec4
-rw-r--r--redhat/applications/kkbswitch/kkbswitch.spec4
-rw-r--r--redhat/applications/klamav/klamav.spec9
-rw-r--r--redhat/applications/klcddimmer/klcddimmer.spec4
-rw-r--r--redhat/applications/kmplayer/kmplayer.spec4
-rw-r--r--redhat/applications/kmymoney/kmymoney.spec90
-rw-r--r--redhat/applications/knemo/knemo.spec4
-rw-r--r--redhat/applications/knetload/knetload.spec2
-rw-r--r--redhat/applications/knetstats/knetstats.spec2
-rw-r--r--redhat/applications/knights/knights.spec2
-rw-r--r--redhat/applications/knmap/knmap.spec4
-rw-r--r--redhat/applications/knowit/knowit.spec2
-rw-r--r--redhat/applications/knutclient/knutclient.spec6
-rw-r--r--redhat/applications/koffice/koffice.spec15
-rw-r--r--redhat/applications/kompose/kompose.spec2
-rw-r--r--redhat/applications/konversation/konversation.spec2
-rw-r--r--redhat/applications/kooldock/kooldock.spec2
-rw-r--r--redhat/applications/kopete-otr/kopete-otr.spec55
-rw-r--r--redhat/applications/kpicosim/kpicosim.spec4
-rw-r--r--redhat/applications/kpilot/kpilot.spec2
-rw-r--r--redhat/applications/kplayer/kplayer.spec2
-rw-r--r--redhat/applications/kpowersave/kpowersave.spec5
-rw-r--r--redhat/applications/krecipes/krecipes.spec12
-rw-r--r--redhat/applications/krename/krename.spec2
-rw-r--r--redhat/applications/kscope/kscope.spec61
-rw-r--r--redhat/applications/ksensors/ksensors.spec4
-rw-r--r--redhat/applications/kshowmail/kshowmail.spec4
-rw-r--r--redhat/applications/kshutdown/kshutdown.spec4
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec2
-rw-r--r--redhat/applications/kstreamripper/kstreamripper.spec2
-rw-r--r--redhat/applications/ksystemlog/ksystemlog.spec56
-rw-r--r--redhat/applications/ktechlab/ktechlab.spec53
-rw-r--r--redhat/applications/kvkbd/kvkbd.spec4
-rw-r--r--redhat/applications/kvpnc/kvpnc.spec4
-rw-r--r--redhat/applications/kxmleditor/kxmleditor.spec2
-rw-r--r--redhat/applications/mathemagics/mathemagics.spec6
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs.spec24
-rw-r--r--redhat/applications/polkit-agent-tde/polkit-agent-tde.spec131
-rw-r--r--redhat/applications/potracegui/potracegui.spec4
-rw-r--r--redhat/applications/qalculate-tde/qalculate-tde.spec48
-rw-r--r--redhat/applications/rosegarden/rosegarden.spec3
-rw-r--r--redhat/applications/smartcardauth/smartcardauth.spec2
-rw-r--r--redhat/applications/system/tdesshaskpass/tdesshaskpass.spec159
-rw-r--r--redhat/applications/tastymenu/tastymenu.spec2
-rw-r--r--redhat/applications/tde-style-baghira/tde-style-baghira.spec3
-rw-r--r--redhat/applications/tde-style-domino/tde-style-domino.spec2
-rw-r--r--redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec2
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik.spec2
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec3
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings.spec62
-rw-r--r--redhat/applications/tdedocker/tdedocker.spec2
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt.spec2
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps.spec4
-rw-r--r--redhat/applications/tdeio-gopher/tdeio-gopher.spec2
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate.spec2
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword.spec4
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec4
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager.spec3
-rw-r--r--redhat/applications/tdepacman/tdepacman.spec4
-rw-r--r--redhat/applications/tdepowersave/tdepowersave.spec3
-rw-r--r--redhat/applications/tdesudo/tdesudo.spec2
-rw-r--r--redhat/applications/tdesvn/tdesvn.spec3
-rw-r--r--redhat/applications/tdmtheme/tdmtheme.spec2
-rw-r--r--redhat/applications/tellico/tellico.spec10
-rw-r--r--redhat/applications/tork/tork.spec4
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal.spec46
-rw-r--r--redhat/applications/twin-style-dekorator/twin-style-dekorator.spec158
-rw-r--r--redhat/applications/twin-style-suse2/twin-style-suse2.spec2
-rw-r--r--redhat/applications/wlassistant/wlassistant.spec10
-rw-r--r--redhat/applications/yakuake/yakuake.spec2
-rwxr-xr-xredhat/build/gather_rpm_sources.sh12
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh22
-rwxr-xr-xredhat/build/get_rpm_package_name.sh7
-rwxr-xr-xredhat/build/get_source_files.sh18
-rwxr-xr-xredhat/build/install_rpm_package.sh2
-rwxr-xr-xredhat/build/rpmdist.sh2
-rw-r--r--redhat/common/cmake/cmake.spec118
-rw-r--r--redhat/dependencies/akode/akode.spec2
-rw-r--r--redhat/dependencies/arts/arts.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt.spec2
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt.spec2
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl.spec2
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec2
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec2
-rw-r--r--redhat/dependencies/polkit-tqt/polkit-tqt.spec231
-rw-r--r--redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc2
-rw-r--r--redhat/dependencies/python-tqt/python-tqt.spec5
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec17
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls.spec2
-rw-r--r--redhat/dependencies/tqca/tqca.spec2
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla.spec97
l---------redhat/dependencies/tqt3/build-examples.sh2
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec2
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec23
-rwxr-xr-xredhat/docker/build.sh6
-rw-r--r--redhat/docker/el6/Dockerfile.i6863
-rw-r--r--redhat/docker/el6/Dockerfile.x86_641
-rw-r--r--redhat/docker/el6/packages2
-rw-r--r--redhat/docker/el6/rpmmacros1
-rw-r--r--redhat/docker/el8/packages5
-rw-r--r--redhat/docker/f34/Dockerfile.x86_645
-rw-r--r--redhat/docker/f34/packages3
-rw-r--r--redhat/docker/f35/Dockerfile.x86_6436
-rw-r--r--redhat/docker/f35/packages236
-rw-r--r--redhat/docker/f35/rpmbuild.repo11
-rw-r--r--redhat/docker/f35/rpmmacros6
-rw-r--r--redhat/docker/f36/Dockerfile.x86_6440
-rw-r--r--redhat/docker/f36/packages238
-rw-r--r--redhat/docker/f36/rpmbuild.repo11
-rw-r--r--redhat/docker/f36/rpmmacros6
-rwxr-xr-xredhat/docker/opensuse32.sh6
-rw-r--r--redhat/docker/oss153/packages2
-rw-r--r--redhat/docker/oss154/Dockerfile.x86_6432
-rw-r--r--redhat/docker/oss154/packages217
-rw-r--r--redhat/docker/oss154/rpmmacros5
-rw-r--r--redhat/docker/osstw/Dockerfile.i68614
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_644
-rw-r--r--redhat/docker/osstw/packages16
-rw-r--r--redhat/docker/pclinuxos.pkg8
-rwxr-xr-xredhat/docker/pclinuxos.sh7
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_649
-rw-r--r--redhat/docker/pclinuxos/packages.x86_646
-rw-r--r--redhat/docker/pclinuxos/rpmmacros3
-rw-r--r--redhat/extras/brp-check-trinity/brp-check-trinity.spec10
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec2
-rw-r--r--redhat/extras/pinentry-tqt/pinentry-tqt.spec4
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec14
-rw-r--r--redhat/extras/trinity-filesystem/trinity-filesystem.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec55
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec2
-rw-r--r--redhat/libraries/libkipi/libkipi.spec2
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec2
-rw-r--r--redhat/main/tde-i18n/tde-i18n.spec2
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility.spec81
-rw-r--r--redhat/main/tdeaddons/tdeaddons.spec12
-rw-r--r--redhat/main/tdeadmin/tdeadmin.spec2
-rw-r--r--redhat/main/tdeartwork/tdeartwork.spec2
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.el411
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc30)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc31)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga55
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga65
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga75
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.el49
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc3216
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc3316
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc35 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc30)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc36 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc31)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga511
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga611
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga711
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.el411
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc3223
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc3323
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc30)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc31)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga515
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga615
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga715
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.el411
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc305
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc315
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc325
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc335
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc32)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc33)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga55
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga65
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga75
-rw-r--r--redhat/main/tdebase/tdebase.spec297
-rw-r--r--redhat/main/tdebase/tdm.fc32.te11
-rw-r--r--redhat/main/tdebase/tdm.fc33.te11
-rw-r--r--redhat/main/tdebase/tdm.fc35.te (renamed from redhat/main/tdebase/tdm.fc30.te)0
-rw-r--r--redhat/main/tdebase/tdm.fc36.te (renamed from redhat/main/tdebase/tdm.fc31.te)0
-rw-r--r--redhat/main/tdebase/tdm.service.fc3512
-rw-r--r--redhat/main/tdebase/tdm.service.fc3612
-rw-r--r--redhat/main/tdebindings/tdebindings.spec73
-rw-r--r--redhat/main/tdeedu/tdeedu.spec2
-rw-r--r--redhat/main/tdegames/tdegames.spec2
-rw-r--r--redhat/main/tdegraphics/tdegraphics.spec2
-rw-r--r--redhat/main/tdelibs/tdelibs.spec8
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia.spec2
-rw-r--r--redhat/main/tdenetwork/tdenetwork.spec31
-rw-r--r--redhat/main/tdepim/tdepim.spec2
-rw-r--r--redhat/main/tdesdk/tdesdk.spec2
-rw-r--r--redhat/main/tdetoys/tdetoys.spec6
-rw-r--r--redhat/main/tdeutils/tdeutils.spec7
-rw-r--r--redhat/main/tdevelop/tdevelop.spec2
-rw-r--r--redhat/main/tdewebdev/tdewebdev.spec84
-rw-r--r--ubuntu/_base/applications/development/ktechlab/debian/docs3
-rw-r--r--ubuntu/_base/applications/development/kxmleditor/debian/docs2
-rw-r--r--ubuntu/_base/applications/internet/kftpgrabber/debian/docs2
-rw-r--r--ubuntu/_base/applications/internet/kopete-otr/debian/docs2
-rw-r--r--ubuntu/_base/applications/internet/tork/debian/docs2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control28
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rwxr-xr-xubuntu/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/control3
-rw-r--r--ubuntu/_base/applications/office/kile/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kile/debian/patches/series (renamed from debian/_base/applications/office/kile/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/_base/applications/office/kile/debian/rules73
-rw-r--r--ubuntu/_base/applications/office/kile/debian/watch2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xubuntu/_base/applications/office/kmymoney/debian/rules43
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/watch2
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source3
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog373
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/control37
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright34
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1145
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages1
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/menu6
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides2
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst16
-rwxr-xr-xubuntu/_base/applications/settings/knetworkmanager8/debian/rules24
-rw-r--r--ubuntu/_base/applications/settings/knetworkmanager8/debian/watch2
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/changelog372
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/control42
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/copyright28
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/install1
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda4
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian5
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm628
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/menu7
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/postinst13
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/postrm26
-rw-r--r--ubuntu/_base/applications/system/kpowersave/debian/preinst39
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog67
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/compat (renamed from ubuntu/_base/applications/system/kpowersave/debian/compat)0
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/control25
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright52
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/docs2
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series (renamed from ubuntu/_base/applications/office/kile/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/_base/applications/system/polkit-agent-tde/debian/rules (renamed from debian/_base/applications/system/kpowersave/debian/rules)8
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format (renamed from ubuntu/_base/applications/system/kpowersave/debian/source/format)0
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options (renamed from ubuntu/_base/applications/system/kpowersave/debian/source/options)0
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog6
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat (renamed from ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat)0
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control16
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright11
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules24
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format1
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options6
-rw-r--r--ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs2
-rw-r--r--ubuntu/_base/applications/themes/twin-style-crystal/debian/docs3
-rw-r--r--ubuntu/_base/applications/utilities/qalculate-tde/debian/docs2
-rw-r--r--ubuntu/_base/common/cmake/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/control6
-rw-r--r--ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kate-trinity.install2
-rw-r--r--ubuntu/_base/core/tdebase/debian/kate-trinity.manpages2
-rw-r--r--ubuntu/_base/core/tdebase/debian/kfind-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kicker-trinity.install4
-rw-r--r--ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages4
-rw-r--r--ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/konqueror-trinity.install3
-rw-r--r--ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages3
-rw-r--r--ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst2
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst2
-rw-r--r--ubuntu/_base/core/tdebase/debian/kpager-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1163
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1175
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1163
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.191
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.154
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1148
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kate-trinity.183
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1156
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.149
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1153
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1159
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1209
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1181
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kfind-trinity.158
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1222
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1150
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1171
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1202
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.151
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1164
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1245
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1179
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kpager-trinity.153
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.166
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1209
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1152
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1173
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1151
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1215
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1189
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1155
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.160
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1173
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1163
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/starttde-trinity.146
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1200
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1163
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.122
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1169
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1160
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1102
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1116
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.122
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.122
-rw-r--r--ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1220
-rwxr-xr-xubuntu/_base/core/tdebase/debian/rules1
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install17
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages17
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages1
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install3
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages3
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdm-trinity.config2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdm-trinity.install6
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages6
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdm-trinity.templates4
-rw-r--r--ubuntu/_base/core/tdebindings/debian/control2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/control6
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install1
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install1
-rwxr-xr-xubuntu/_base/core/tdegraphics/debian/rules4
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install2
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install15
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install2
-rw-r--r--ubuntu/_base/core/tdetoys/debian/kweather-trinity.install9
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/changelog66
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/compat1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/control61
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/copyright101
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install31
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install8
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/patches/series0
-rwxr-xr-xubuntu/_base/dependencies/polkit-tqt/debian/rules23
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/format1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/options6
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs2
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install3
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides23
-rwxr-xr-xubuntu/_base/dependencies/python-tqt/debian/rules12
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/control69
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from debian/_base/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xubuntu/_base/dependencies/sip4-tqt/debian/rules64
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/control21
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/dirs2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xubuntu/_base/dependencies/tqscintilla/debian/rules129
-rwxr-xr-xubuntu/_base/dependencies/tqtinterface/debian/rules9
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/docs3
-rwxr-xr-xubuntu/_base/libraries/libtqt-perl/debian/rules1
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs2
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rwxr-xr-xubuntu/_base/libraries/python-trinity/debian/rules4
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/watch3
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm3
-rw-r--r--ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog5
-rw-r--r--ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control13
-rw-r--r--ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs1
-rw-r--r--ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop11
-rw-r--r--ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install1
-rwxr-xr-xubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules29
l---------ubuntu/jammy (renamed from debian/jessie)0
l---------ubuntu/kinetic (renamed from ubuntu/groovy)0
l---------ubuntu/trusty1
843 files changed, 7733 insertions, 27655 deletions
diff --git a/arch/PKGBUILD.template b/arch/PKGBUILD.template
index 8b1d87d1c..3df27ff30 100644
--- a/arch/PKGBUILD.template
+++ b/arch/PKGBUILD.template
@@ -4,8 +4,9 @@
_mod=tdepowersave
_cat=applications/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
pkgrel=1
pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
arch=('i686' 'x86_64')
@@ -17,12 +18,12 @@ depends=(
'tde-tdelibs'
)
makedepends=(
+ 'tde-cmake-trinity'
'autoconf'
- 'cmake'
'pkgconfig'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
@@ -40,18 +41,19 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/build.sh b/arch/build.sh
index cdce2c1a8..e569a0096 100755
--- a/arch/build.sh
+++ b/arch/build.sh
@@ -17,10 +17,10 @@ compile_directory() {
}
### Build Packages
-compile_directory tde-core "tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
+compile_directory tde-core "cmake-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2"
-compile_directory tde-base "tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
-compile_directory tde-extra "tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
+compile_directory tde-base "i18n tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
+compile_directory tde-extra "akode tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
compile_directory tde-devel "tdesdk tdevelop tdewebdev"
### Copy completed packages to out folder and download dependencies to out folder
@@ -29,7 +29,7 @@ mkdir -p $tdesrc/out
cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/htdig-3.2.0b6-11-x86_64.pkg.tar.xz -O $tdesrc/out/htdig-3.2.0b6-11-x86_64.pkg.tar.xz
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/lcms-1.19-7-x86_64.pkg.tar.xz
-wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst -O $tdesrc/out/pod2man-5.30.2-1-x86_64.pkg.tar.zst
wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/python2-lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/python2-lcms-1.19-7-x86_64.pkg.tar.xz
### Create trinity pacman repo
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD
new file mode 100644
index 000000000..f598f6a1e
--- /dev/null
+++ b/arch/tde-base/tde-i18n/PKGBUILD
@@ -0,0 +1,148 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tde-i18n
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod/tde-}"
+pkgname=("$pkgbase")
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="Internationalized (i18n) files for TDE"
+arch=('any')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+makedepends=('tde-cmake-trinity')
+depends=('tde-tdelibs')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('62e049f7717401eed9994d05c1430578')
+install=''
+
+_languages=(
+ 'af "Afrikaans"'
+ 'ar "Arabic"'
+ 'az "Azerbaijani"'
+ 'be "Belarusian"'
+ 'bg "Bulgarian"'
+ 'bn "Bengali"'
+ 'br "Breton"'
+ 'bs "Bosnian"'
+ 'ca "Catalan"'
+ 'cs "Czech"'
+ 'csb "Kashubian"'
+ 'cy "Welsh"'
+ 'da "Danish"'
+ 'de "German"'
+ 'el "Greek"'
+ 'en_GB "English (British)"'
+ 'eo "Esperanto"'
+ 'es "Spanish"'
+ 'es_AR "Spanish (Argentina)"'
+ 'et "Estonian"'
+ 'eu "Basque"'
+ 'fa "Persian"'
+ 'fi "Finnish"'
+ 'fr "French"'
+ 'fy "Frisian"'
+ 'ga "Irish"'
+ 'gl "Galician"'
+ 'he "Hebrew"'
+ 'hi "Hindi"'
+ 'hr "Croatian"'
+ 'hu "Hungarian"'
+ 'is "Icelandic"'
+ 'it "Italian"'
+ 'ja "Japanese"'
+ 'kk "Kazakh"'
+ 'km "Khmer"'
+ 'ko "Korean"'
+ 'lt "Lithuanian"'
+ 'lv "Latvian"'
+ 'mk "Macedonian"'
+ 'mn "Mongolian"'
+ 'ms "Malay"'
+ 'nb "Norwegian Bokmål"'
+ 'nds "Low Saxon"'
+ 'nl "Dutch"'
+ 'nn "Norwegian Nynorsk"'
+ 'pa "Punjabi"'
+ 'pl "Polish"'
+ 'pt "Portuguese"'
+ 'pt_BR "Portuguese (Brazil)"'
+ 'ro "Romanian"'
+ 'ru "Russian"'
+ 'rw "Kinyarwanda"'
+ 'se "Northern Sami"'
+ 'sk "Slovak"'
+ 'sl "Slovenian"'
+ 'sr "Serbian"'
+ 'sr@Latn "Serbian Latin"'
+ 'ss "Swati"'
+ 'sv "Swedish"'
+ 'ta "Tamil"'
+ 'te "Telugu"'
+ 'tg "Tajik"'
+ 'th "Thai"'
+ 'tr "Turkish"'
+ 'uk "Ukrainian"'
+ 'uz "Uzbek"'
+ 'uz@cyrillic "Uzbek (Cyrillic)"'
+ 'vi "Vietnamese"'
+ 'wa "Walloon"'
+ 'zh_CN "Chinese (Simplified)"'
+ 'zh_TW "Chinese (Traditional)"'
+)
+
+_pkglangs=()
+for _lang in "${_languages[@]}"; do
+ _locale=${_lang%% *}
+ _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \
+ sed "s|@latn|latin|" | \
+ tr -d "_" | tr -d "@")
+ _pkgname=${pkgbase}-${_pkglang}
+
+ pkgname+=($_pkgname)
+ _pkglangs+=($_pkgname)
+ eval "package_$_pkgname() {
+ _package $_pkglang $_lang
+ }"
+done
+
+_package() {
+ pkgdesc="$3 ($2) internationalized (i18n) files for TDE"
+ provides=("${_mod}-${1}")
+ conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}")
+ replaces=("trinity-${_mod}-${1}")
+
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_}
+}
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON
+
+ msg "Building - ${pkgname#*-}..."
+ ninja $NUMJOBS
+}
+
+package_tde-i18n() {
+ pkgdesc="All languages (all) internationalized (i18n) files for TDE"
+ provides=("${_mod}")
+ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+ replaces=("trinity-${_mod}")
+ depends+=(${_pkglangs[@]})
+}
diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
new file mode 100644
index 000000000..c27ddf9d9
--- /dev/null
+++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=polkit-agent-tde
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="TDE dialogs for PolicyKit"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-base')
+depends=(
+ 'tde-tdelibs'
+ 'tde-polkit-tqt'
+)
+makedepends=(
+ 'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3d3987adfcac0d9bd9e342d58fd063a8')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
index 7dcd22bcf..a1ca30728 100644
--- a/arch/tde-base/tde-tdeadmin/PKGBUILD
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -1,48 +1,52 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeadmin
-pkgver=14.0.10
+_mod=tdeadmin
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="The TDE system administration utilities"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz")
-md5sums=('401907e03f80ad2433614761af6978b1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e76c21cbd47a42c2d71e882c2f1283c2')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
- -DBUILD_KNETWORKCONF=OFF
+ -DBUILD_KNETWORKCONF=OFF \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
index d5a66134c..12c2cc377 100644
--- a/arch/tde-base/tde-tdeartwork/PKGBUILD
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -1,48 +1,51 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeartwork
-pkgver=14.0.10
+_mod=tdeartwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeartwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
depends=('tde-tdebase' 'xscreensaver' 'libxss')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=('tdeartwork')
-conflicts=('trinity-tdeartwork' 'trinity-kdeartwork')
-replaces=('trinity-tdeartwork')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeartwork-trinity-${pkgver}.tar.xz")
-md5sums=('71830a98f9d130a37ba1b3c6107fdd66')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a5dd6908aff6731593deddaaefcd03cd')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
index ecdbc822b..cd59a6156 100644
--- a/arch/tde-base/tde-tdebindings/PKGBUILD
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -3,26 +3,23 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdebindings
-pkgver=14.0.10
+_mod=tdebindings
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https//scm.trinitydesktop.org/scm/git/tdebindings'
+url="https//scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop bindings"
depends=('tde-tdelibs')
makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2')
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
- 'bp000-817f960e.diff'
- 'bp001-8301a3c8.diff'
- 'bp002-33697c89.diff')
-md5sums=('47294367d80fa79fefa80d755a6bf93d'
- '79e6de2ddfec059b7601fac3f3a1adc5'
- '8267435e92a265b83efbf07db5e36c01'
- 'feb8afbd1b3467c3e36f1dffb8c5ca53')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('305423d327fe5b7ca3260932044fa51d')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -31,11 +28,6 @@ build() {
## Generate config files and update with autoreconf
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- msg "Apply backported patches..."
- patch -p1 < ${srcdir}/bp000-817f960e.diff
- patch -p1 < ${srcdir}/bp001-8301a3c8.diff
- patch -p1 < ${srcdir}/bp002-33697c89.diff
-
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
diff --git a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff b/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
deleted file mode 100644
index e8d31b474..000000000
--- a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 817f960e8ecca5074171cfc8267dcebbb1a7f514 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Mon, 10 May 2021 20:45:41 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qt.cpp:2643:17: error: ordered comparison of pointer with integer zero ('void*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- qtruby/rubylib/qtruby/Qt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
-index 834cc3b2..abb44588 100644
---- a/qtruby/rubylib/qtruby/Qt.cpp
-+++ b/qtruby/rubylib/qtruby/Qt.cpp
-@@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj)
- {
- void * ptr = 0;
- ptr = value_to_ptr(obj);
-- return (ptr > 0 ? Qtrue : Qfalse);
-+ return (ptr != 0 ? Qtrue : Qfalse);
- }
-
- static VALUE
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff b/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
deleted file mode 100644
index b64ad2535..000000000
--- a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff
+++ /dev/null
@@ -1,401 +0,0 @@
-From 8301a3c8e542675e9b5f310d79ad24b9a12baaf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Wed, 22 Sep 2021 20:38:45 +0200
-Subject: Add check whether Ruby requires explicit specification of C++
- standard.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- korundum/bin/Makefile.am | 2 +
- korundum/configure.in.in | 90 +++++++++++++++++++++++++++++++
- korundum/rubylib/korundum/Makefile.am | 2 +
- korundum/rubylib/korundum/configure.in.in | 59 --------------------
- qtruby/bin/Makefile.am | 2 +
- qtruby/configure.in.in | 90 +++++++++++++++++++++++++++++++
- qtruby/rubylib/designer/uilib/Makefile.am | 2 +
- qtruby/rubylib/qtruby/Makefile.am | 2 +
- qtruby/rubylib/qtruby/configure.in.in | 59 --------------------
- 9 files changed, 190 insertions(+), 118 deletions(-)
- create mode 100644 korundum/configure.in.in
- delete mode 100644 korundum/rubylib/korundum/configure.in.in
- create mode 100644 qtruby/configure.in.in
- delete mode 100644 qtruby/rubylib/qtruby/configure.in.in
-
-diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
-index 508f7731..47a8bb02 100644
---- a/korundum/bin/Makefile.am
-+++ b/korundum/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = krubyinit
-diff --git a/korundum/configure.in.in b/korundum/configure.in.in
-new file mode 100644
-index 00000000..c420adc9
---- /dev/null
-+++ b/korundum/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
-index 840b6ab6..74995c3d 100644
---- a/korundum/rubylib/korundum/Makefile.am
-+++ b/korundum/rubylib/korundum/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
-deleted file mode 100644
-index 0a987639..00000000
---- a/korundum/rubylib/korundum/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
-diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am
-index a1005f0b..988ba3d4 100644
---- a/qtruby/bin/Makefile.am
-+++ b/qtruby/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- bin_PROGRAMS = qtrubyinit
-diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
-new file mode 100644
-index 00000000..84ad88ec
---- /dev/null
-+++ b/qtruby/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+ DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
-+else
-+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+ if test "$RUBY_SERIES" -ge "19"; then
-+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+ fi
-+
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+ else
-+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+ fi
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+ else
-+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+ fi
-+
-+ # check if Ruby requires explicit specification of C++ standard
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ SAVED_CXXFLAGS="$CXXFLAGS"
-+ for CXX_STD_TEST in "" 11 14 17; do
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ if test "x$CXX_STD_TEST" = "x"; then
-+ AC_MSG_CHECKING([Ruby build with default C++ standard])
-+ RUBY_CXXFLAGS=""
-+ else
-+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+ fi
-+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+ AC_TRY_COMPILE([
-+ #include <ruby.h>
-+ ],[ ],
-+ ruby_cxx_std=yes,
-+ ruby_cxx_std=no
-+ )
-+ if test "x$ruby_cxx_std" = "xyes"; then
-+ AC_SUBST(RUBY_CXXFLAGS)
-+ AC_MSG_RESULT(yes)
-+ break
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CXXFLAGS="$SAVED_CXXFLAGS"
-+ AC_LANG_RESTORE
-+
-+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+ RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+ RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+ AC_MSG_RESULT([\
-+ archdir $RUBY_ARCHDIR,
-+ sitearchdir $RUBY_SITEARCHDIR,
-+ sitedir $RUBY_SITEDIR,
-+ rubylibdir $RUBY_RUBYLIBDIR,
-+ libdir $RUBY_LIBDIR,
-+ includedir $RUBY_INCLUDEDIR,
-+ librubyarg $RUBY_LIBRUBYARG,
-+ cflags $RUBY_CFLAGS,
-+ cxxflags $RUBY_CXXFLAGS])
-+ AC_SUBST(RUBY_ARCHDIR)
-+ AC_SUBST(RUBY_SITEARCHDIR)
-+ AC_SUBST(RUBY_SITEDIR)
-+ AC_SUBST(RUBY_RUBYLIBDIR)
-+ AC_SUBST(RUBY_LIBDIR)
-+ AC_SUBST(RUBY_INCLUDEDIR)
-+ AC_SUBST(RUBY_LIBRUBYARG)
-+ AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
-index 45876ed6..80363009 100644
---- a/qtruby/rubylib/designer/uilib/Makefile.am
-+++ b/qtruby/rubylib/designer/uilib/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
-index 7083719c..c273c599 100644
---- a/qtruby/rubylib/qtruby/Makefile.am
-+++ b/qtruby/rubylib/qtruby/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
-
- noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb
-diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
-deleted file mode 100644
-index db0594a3..00000000
---- a/qtruby/rubylib/qtruby/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
-- DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
--else
-- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
-- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
-- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-- if test "$RUBY_SERIES" -ge "19"; then
-- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-- fi
--
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-- else
-- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-- fi
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-- else
-- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-- fi
--
-- # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-- RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-- RUBY_SITEDIR=${RUBY_SITEDIR%/}
-- RUBY_LIBDIR=${RUBY_LIBDIR%/}
-- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
-- AC_MSG_RESULT([\
-- archdir $RUBY_ARCHDIR,
-- sitearchdir $RUBY_SITEARCHDIR,
-- sitedir $RUBY_SITEDIR,
-- rubylibdir $RUBY_RUBYLIBDIR,
-- libdir $RUBY_LIBDIR,
-- includedir $RUBY_INCLUDEDIR,
-- librubyarg $RUBY_LIBRUBYARG,
-- cflags $RUBY_CFLAGS])
-- AC_SUBST(RUBY_ARCHDIR)
-- AC_SUBST(RUBY_SITEARCHDIR)
-- AC_SUBST(RUBY_SITEDIR)
-- AC_SUBST(RUBY_RUBYLIBDIR)
-- AC_SUBST(RUBY_LIBDIR)
-- AC_SUBST(RUBY_INCLUDEDIR)
-- AC_SUBST(RUBY_LIBRUBYARG)
-- AC_SUBST(RUBY_CFLAGS)
--fi
--
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
deleted file mode 100644
index a559fec2a..000000000
--- a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 5092f046c4f6b678a728bb1156123e0f0e45380f
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri Sep 24 15:02:20 2021 +0200
-
- Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
- (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
-
-diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
-index be90dd10..2fe8e5d5 100644
---- a/dcopjava/binding/Makefile.am
-+++ b/dcopjava/binding/Makefile.am
-@@ -1,8 +1,8 @@
- lib_LTLIBRARIES = libjavadcop.la
-
- libjavadcop_la_SOURCES = client.cpp
--libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
--libjavadcop_la_LIBADD = $(LIB_TDECORE)
-+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
-+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-
- INCLUDES = $(jni_includes) $(all_includes)
-
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD
index 29618eb11..1731412cb 100644
--- a/arch/tde-base/tde-tdegraphics/PKGBUILD
+++ b/arch/tde-base/tde-tdegraphics/PKGBUILD
@@ -1,54 +1,63 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com>
-pkgname=tde-tdegraphics
-pkgver=14.0.10
+_mod=tdegraphics
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity Desktop Graphics Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegraphics'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
-depends=('tde-tdelibs' 'libgphoto2' 'fribidi' 'sane')
-makedepends=('pkgconfig' 'cmake' 'imlib')
-provides=('tdegraphics')
-conflicts=('trinity-tdegraphics' 'trinity-kdegraphics')
-replaces=('trinity-tdegraphics')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegraphics-trinity-${pkgver}.tar.xz"
- 'bp000-d19460fd6e.diff'
- 'bp001-866f96c1f4.diff')
-md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9'
- 'c5ccbf331b4b0b6a0af61687cc3308a5'
- 'bd4a586fb17963697afceef79adc35a5')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+ 'bp000-poppler-2203.diff')
+md5sums=('9e91406d7e02515a41ae60bd2a21440a'
+ 'cd9b5a969ce31dae64fb8764a5e7b60f')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-d19460fd6e.diff
- patch -p1 < ${srcdir}/bp001-866f96c1f4.diff
+prepare() {
+ msg "Apply backported patches"
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+ patch -p1 < ${srcdir}/bp000-poppler-2203.diff
+}
- cd $srcdir
+build() {
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_T1LIB=ON \
+ -DWITH_PAPER=ON \
+ -DWITH_TIFF=ON \
+ -DWITH_OPENEXR=ON \
+ -DWITH_PDF=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
deleted file mode 100644
index 1565ee3f2..000000000
--- a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001
-From: Mavridis Philippe <mavridisf@gmail.com>
-Date: Thu, 8 Jul 2021 23:14:10 +0300
-Subject: Corrected boolean usage to conform with C++17 standard.
-
-This resolves a FTBFS on some systems.
-
-Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
----
- kfaxview/libkfaximage/faxinit.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp
-index aa6166aa..fa4517d2 100644
---- a/kfaxview/libkfaximage/faxinit.cpp
-+++ b/kfaxview/libkfaximage/faxinit.cpp
-@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
- void
- fax_init_tables(void)
- {
-- static bool already_initialized = 0;
-+ static bool already_initialized = false;
- if (already_initialized)
- return;
-
-- ++already_initialized;
-+ already_initialized = true;
-
- FillTable(MainTable, 7, Pass, S_Pass);
- FillTable(MainTable, 7, Horiz, S_Horiz);
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff
new file mode 100644
index 000000000..aa170d53e
--- /dev/null
+++ b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff
@@ -0,0 +1,81 @@
+commit 9adc0f647c04e84792be63d913274633cc2ecd65
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date: Sat Apr 30 01:48:37 2022 +0200
+
+ Add support for Poppler >= 22.03.
+
+ Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+
+diff --git a/config.h.cmake b/config.h.cmake
+index 7c1ab17a..fea46aaf 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -1,6 +1,7 @@
+ #cmakedefine VERSION "@VERSION@"
+
+ // poppler-tqt
++#cmakedefine HAVE_POPPLER_2203
+ #cmakedefine HAVE_POPPLER_2112
+ #cmakedefine HAVE_POPPLER_2111
+ #cmakedefine HAVE_POPPLER_2108
+diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+index fa82dd3c..def19529 100644
+--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+@@ -24,7 +24,7 @@ check_cxx_source_compiles("
+ HAVE_POPPLER_030 )
+ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+
+-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 )
++foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 22.03 )
+ string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
+ if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
+ message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
+diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
+index 78e8befe..86e831ee 100644
+--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
+@@ -50,7 +50,11 @@ Document *Document::load(const TQString &filePath)
+ #endif
+ }
+
++# if defined(HAVE_POPPLER_2203)
++ DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {});
++# else
+ DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL);
++# endif
+ Document *pdoc;
+ if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) {
+ pdoc = new Document(doc);
+@@ -84,10 +88,15 @@ bool Document::unlock(const TQCString &password)
+ {
+ if (data->locked) {
+ /* racier then it needs to be */
++# if defined(HAVE_POPPLER_2203)
++ DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()),
++ GooString(password.data()));
++# else
+ GooString *filename = new GooString(data->doc.getFileName());
+ GooString *pwd = new GooString(password.data());
+ DocumentData *doc2 = new DocumentData(filename, pwd);
+ delete pwd;
++# endif
+ if (!doc2->doc.isOk()) {
+ delete doc2;
+ } else {
+diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
+index c98d02b8..f1096ceb 100644
+--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
+@@ -104,7 +104,11 @@ class LinkDestinationData {
+
+ class DocumentData {
+ public:
++# if defined(HAVE_POPPLER_2203)
++ DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {}
++# else
+ DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {}
++# endif
+
+ ~DocumentData()
+ {
diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
deleted file mode 100644
index 3508d7437..000000000
--- a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Thu, 8 Jul 2021 19:46:45 +0200
-Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves
- FTBFS on FreeBSD 13.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- kpovmodeler/CMakeLists.txt | 4 ++--
- kpovmodeler/ConfigureChecks.cmake | 9 +++++----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
-index 6ec98ae4..b589117f 100644
---- a/kpovmodeler/CMakeLists.txt
-+++ b/kpovmodeler/CMakeLists.txt
-@@ -19,7 +19,7 @@ include_directories(
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-- ${GLU_INCLUDE_DIRS}
-+ ${OPENGL_INCLUDE_DIRS}
- ${FREETYPE_INCLUDE_DIRS}
- )
-
-@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
- pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
- pmpartiface.skel
- VERSION 0.0.0
-- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
-+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
-index f4fdd1c0..a55045d4 100644
---- a/kpovmodeler/ConfigureChecks.cmake
-+++ b/kpovmodeler/ConfigureChecks.cmake
-@@ -10,13 +10,14 @@
- #################################################
-
- # glu
--pkg_search_module( GLU glu )
--if( NOT GLU_FOUND )
-+set( OpenGL_GL_PREFERENCE LEGACY )
-+find_package( OpenGL )
-+if( NOT OPENGL_FOUND )
- check_include_file ( GL/glu.h HAVE_GLU )
- if( NOT HAVE_GLU )
-- tde_message_fatal( "glu is required, but was not found on your system" )
-+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
- endif ( )
-- set( GLU_LIBRARIES "-lGL -lGLU" )
-+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
- endif( )
-
-
---
-cgit v1.2.1
-
diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD
index 46126989c..91c530e94 100644
--- a/arch/tde-base/tde-tdeutils/PKGBUILD
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeutils
-pkgver=14.0.10
+_mod=tdeutils
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="The TDE something - with Trinity upstream"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdebase' 'xmms2')
-makedepends=('pkgconfig' 'cmake' 'python2')
+makedepends=('tde-cmake-trinity' 'python2')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeutils-trinity-${pkgver}.tar.xz")
-md5sums=('95e778a8775b416739fd7e836e4ecdcd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('d5b2c81c4fc59351ae1be3059fc5df1f')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
## cmake call
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
-DWITH_DPMS=ON \
- -DBUILD_ALL=ON
+ -DWITH_XSCREENSAVER=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD
index e58281542..a546c02dc 100644
--- a/arch/tde-core/tde-arts/PKGBUILD
+++ b/arch/tde-core/tde-arts/PKGBUILD
@@ -3,12 +3,16 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-arts
-pkgver=14.0.10
+_mod=arts
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
-pkgdesc="Trinity ARTS Sound System and libraries"
+pkgdesc="Trinity aRts Sound System and libraries"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/arts'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('alsa-plugins'
@@ -21,39 +25,41 @@ depends=('alsa-plugins'
'libvorbis'
'pulseaudio-alsa'
'tde-tqtinterface')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma'
'lame: A high quality MPEG Audio Layer III (MP3) encoder'
'libmp3splt: Library for splitting mp3 and ogg files without decoding'
'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files'
'vorbis-tools: Extra tools for Ogg-Vorbis')
-provides=('arts')
-conflicts=('kdemod3-arts' 'arts')
-replaces=('trinity-arts')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz")
-md5sums=('d9d719e824acd5397dda709ed5352feb')
-install='tde-arts.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a48103a0a8ecdc098f6f2f834f0951cb')
+install="tde-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_ESOUND=OFF \
+ -DWITH_JACK=OFF
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
index 2df40dd16..5be183188 100644
--- a/arch/tde-core/tde-avahi-tqt/PKGBUILD
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -1,42 +1,46 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-avahi-tqt
-pkgver=14.0.10
+_mod=avahi-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity Avahi-TQt"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
# nss-mdns should probably move to tdelibs depends
-makedepends=('pkgconfig' 'cmake')
-provides=('avahi-tqt')
-replaces=('trinity-avahi-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('6cce8423a3030505bb56a8c73f6235d6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ad128b35e54f8000a620aaf54023aa5d')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake-trinity/PKGBUILD
new file mode 100644
index 000000000..6164de7f7
--- /dev/null
+++ b/arch/tde-core/tde-cmake-trinity/PKGBUILD
@@ -0,0 +1,51 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=cmake-trinity
+_cat=common/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="TDE CMake modules"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=(
+ 'cmake'
+ 'perl'
+ 'ninja'
+ 'pkgconfig'
+)
+makedepends=()
+optdepends=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
+md5sums=('b41eaff33371172c2a12b9e47f9c1fdf')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
index 907060c9f..984822105 100644
--- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
@@ -3,43 +3,47 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-dbus-1-tqt
-pkgver=14.0.10
+_mod=dbus-1-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core' 'tde-base')
depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-1-tqt')
-conflicts=('trinity-dbus-1-tqt')
-replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('4954efb83544c72272ba803eb44b72ec')
-install='trinity-dbus-1-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('907b32908215ffb7aa8ba802e29de93f')
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD
index 7e1c73d32..67264ec18 100644
--- a/arch/tde-core/tde-dbus-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD
@@ -3,41 +3,44 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-dbus-tqt
-pkgver=14.0.10
+_mod=dbus-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
pkgdesc="Trinity TQt DBus wrapper"
depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951')
-install='trinity-dbus-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('d57e740bb2437e25b25694188fae1b4c')
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
- -DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_GCC_VISIBILITY=ON
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=$TDEDIR
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD
index c6f03a951..1f577ab22 100644
--- a/arch/tde-core/tde-libart-lgpl/PKGBUILD
+++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD
@@ -1,24 +1,28 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libart-lgpl
-pkgver=14.0.10
+_mod=libart-lgpl
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity Desktop LGPL'd Component"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libart-lgpl"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('LGPL')
groups=('tde-core')
#depends=('')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=('libart-lgpl')
+provides=("${_mod}")
conflicts=()
replaces=()
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz")
-md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('8318cba1b6d3220fd4cf18c29977f67d')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -30,15 +34,16 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD
new file mode 100644
index 000000000..34fcd8308
--- /dev/null
+++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=polkit-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="Trinity PolicyKit-tqt library"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core' 'tde-base')
+depends=('tde-tqtinterface' 'tde-dbus-1-tqt' 'polkit')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4cfc24c4c4c4adc7e589aa4f2c27be4e')
+install="trinity-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - $pkgname..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install
new file mode 100644
index 000000000..2a8dc4c98
--- /dev/null
+++ b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install
@@ -0,0 +1,12 @@
+post_install() {
+ ldconfig &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 85f569247..c03d9add0 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -1,16 +1,19 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname='tde-tdebase'
-pkgver=14.0.10
-pkgrel=2
+_mod=tdebase
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
pkgdesc="Trinity Desktop Enviroment base components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdebase'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
-provides=('tdebase')
+provides=("${_mod}")
groups=('tde-core')
-# depends=('hal'
depends=('libraw1394'
'libxtst'
'libxss'
@@ -23,15 +26,12 @@ depends=('libraw1394'
'xorg-xinit'
'htdig'
'openssl-1.0')
-makedepends=('autoconf'
- 'cmake'
- 'imake'
- 'pkgconfig'
- 'libxkbfile'
- 'smbclient'
- 'rpcsvc-proto'
- 'xorg-bdftopcf'
- 'xscreensaver')
+makedepends=('tde-cmake-trinity'
+ 'libxkbfile'
+ 'smbclient'
+ 'rpcsvc-proto'
+ 'xorg-bdftopcf'
+ 'xscreensaver')
optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
'pciutils: PCI bus configuration space access library and tools'
'samba: file sharing over SMB'
@@ -44,12 +44,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
'xorg-fonts-75dpi: X.org 75dpi fonts collection'
'xscreensaver: Screen saver and locker for the X Window System')
-confilicts=('trinity-kdebase ''kdemod3-kdebase')
-replaces=('trinity-tdebase')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-install='trinity-tdebase.install'
+install="trinity-${_mod}.install"
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
'agent-shutdown.sh'
'agent-startup.sh'
'tdm-trinity'
@@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
'tdm.service'
'xsession.patch')
-md5sums=('bca895dfc2b88c4b74e307d5690108bf'
+md5sums=('cea523c3144c4c22966244e9921848d4'
'18e8d01124b19f7df2937c06e177bf7f'
'c963ef6e37c9051119972a58c67f05fb'
'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -68,16 +68,16 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DWITH_SASL=ON \
@@ -89,8 +89,6 @@ build() {
-DWITH_XFIXES=ON \
-DWITH_XRANDR=ON \
-DWITH_XRENDER=ON \
- -DWITH_XDAMAGE=ON \
- -DWITH_XEXT=ON \
-DWITH_XTEST=ON \
-DWITH_OPENGL=ON \
-DWITH_XSCREENSAVER=ON \
@@ -111,13 +109,13 @@ build() {
-DTDM_PAM_SERVICE=tde \
-DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd $srcdir/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
# install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
install -d -m755 ${pkgdir}/usr/share/xsessions
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 759b18d6a..bdb3d5e00 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -3,12 +3,16 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdelibs
-pkgver=14.0.10
-pkgrel=2
+_mod=tdelibs
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
pkgdesc="Trinity Desktop core libraries and applications"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdelibs'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
depends=('aspell'
@@ -32,29 +36,28 @@ depends=('aspell'
'xorg-xprop'
'xorg-xset'
'xorg-xsetroot')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdelibs')
-conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
-replaces=('trinity-kdelibs' 'trinity-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3")
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
-
-md5sums=('cbb77407a886b588b4749524ae8e5edd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('51ee6897dd364a3d6f42d633fcf53efc')
-install='trinity-tdelibs.install'
+install="trinity-${_mod}.install"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -84,13 +87,13 @@ build() {
-DWITH_HSPELL=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
msg "Removing conflicting images"
rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
}
diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD
index 52b19c726..878c4da6c 100644
--- a/arch/tde-core/tde-tqca-tls/PKGBUILD
+++ b/arch/tde-core/tde-tqca-tls/PKGBUILD
@@ -3,45 +3,51 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tqca-tls
-pkgver=14.0.10
+_mod=tqca-tls
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tqca-tls'
+url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}"
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'openssl-1.0')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqca-tls')
-conflicts=('trinity-tqca-tls')
-replaces=('trinity-tqca-tls')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz")
-md5sums=('6347f50dd8b44cc1f7a35329bd578ba1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
+md5sums=('0ded8a6923a3d77459daf2f8f207905c')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
- cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_GCC_VISIBILITY=ON
+ -DBUILD_ALL=OFF \
+ -DBUILD_TQCA_TLS=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD
new file mode 100644
index 000000000..4c04b7be4
--- /dev/null
+++ b/arch/tde-core/tde-tqca/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tqca
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('0ded8a6923a3d77459daf2f8f207905c')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=$QTDIR \
+ -DBUILD_ALL=OFF \
+ -DBUILD_TQCA=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - $pkgname..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
index 0f56bd687..33c584b19 100644
--- a/arch/tde-core/tde-tqt3/PKGBUILD
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -3,13 +3,17 @@
# Contributor: Calvin Morrison <MutantTurkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgbase=tde-tqt3
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.0.10
+pkgver=14.0.12
pkgrel=1
pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqt3"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-core')
options=('staticlibs' 'libtool' '!emptydirs' '!strip')
@@ -22,19 +26,16 @@ makedepends=('libcups'
'libmng'
'xorg-xrandr'
'libxft'
+ 'libxmu'
'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz"
- 'bp000-fix-build-key.diff')
-md5sums=('47d8495fcf444c5db2cf56843be3f746'
- '950e3885135fd9844de856c770f19767')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a147fb23063a794f3e06dd6aa52ef087')
_prefix="/opt/trinity/tqt3"
build() {
- cd ${srcdir}/tqt3-trinity-${pkgver}
-
- patch -p1 < ${srcdir}/bp000-fix-build-key.diff
+ cd ${srcdir}/${_mod}-trinity-${pkgver}
# These are probably arch-specific. They were present in old qt3
# PKGBULD, they were present in kdemod3 PKGBUILD, they are present
@@ -54,7 +55,7 @@ build() {
sed -i "s|read acceptance|acceptance=yes|" configure
msg "Setting enviroment variables..."
- export QTDIR="${srcdir}/tqt3-trinity-${pkgver}"
+ export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@@ -94,6 +95,7 @@ build() {
-platform linux-g++${ARCH} \
-no-exceptions \
-thread \
+ -enable-opengl \
-dlopen-opengl \
-no-ipv6
@@ -146,8 +148,8 @@ package_tde-tqt3() {
make INSTALL_ROOT="$pkgdir" install
- ## remove doc as it is now in a split package tde-tqt3-doc
- rm -r "${pkgdir}${_prefix}/doc"
+ ## remove doc as it is now in a split package tde-tqt3-doc
+ rm -r "${pkgdir}${_prefix}/doc"
# install link the apps provided by qt3 so we don't collide with
# qt4 and can run them.
diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
deleted file mode 100644
index a0a0aa42e..000000000
--- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Wed Sep 22 15:00:08 2021 +0200
-
- Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/configure b/configure
-index 92cec273..f021f563 100755
---- a/configure
-+++ b/configure
-@@ -2828,7 +2828,7 @@ g++*)
- 3.*)
- COMPILER_VERSION="3.*"
- ;;
-- [1-9][0-9]|[7-9]|[4-6].*)
-+ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
- COMPILER_VERSION="4.*"
- ;;
- *)
diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
index 43774f594..2297b62f4 100644
--- a/arch/tde-core/tde-tqtinterface/PKGBUILD
+++ b/arch/tde-core/tde-tqtinterface/PKGBUILD
@@ -3,34 +3,34 @@
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tqtinterface
-pkgver=14.0.10
+_mod=tqtinterface
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqtinterface"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL2')
groups=('tde-core')
pkgdesc="TQt interface for the TDE desktop"
depends=('tde-tqt3' 'glu')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqtinterface')
-conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
# makeopts=('libtool' '!emptydirs' '!strip')
options=('staticlibs' 'libtool' '!emptydirs' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz"
- 'tqtpc-location.patch')
-
-md5sums=('76b04fce54a40edf46a7421a5f3e176f'
- 'c15745c944d98cb7c4cb553f0ca421d4')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fae4701c1b7416fdf32855063642612b')
-install='trinity-tqtinterface.install'
+install="trinity-${_mod}.install"
_prefix=/usr
-_tdedir=/opt/trinity
-
-[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
cd $srcdir
@@ -38,24 +38,27 @@ build() {
mkdir -p build
cd build
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \
-DMOC_EXECUTABLE=${QTDIR}/bin/moc \
-DQT_VERSION=3
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
# Create and install ld.so.conf.d file
install -d -m755 $pkgdir/etc/ld.so.conf.d/
- echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
- echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+ echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+ echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
}
diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
deleted file mode 100644
index f256e925c..000000000
--- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200
-+++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
- tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
- tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" )
--tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
-+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
-
-
- ##### tqtinterface sources ######################
diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD
index eeff69672..b87d2763a 100644
--- a/arch/tde-devel/tde-tdesdk/PKGBUILD
+++ b/arch/tde-devel/tde-tdesdk/PKGBUILD
@@ -1,46 +1,49 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdesdk
-pkgver=14.0.10
+_mod=tdesdk
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdesdk'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Desktop Development Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man')
-provides=('tdesdk')
-conflicts=('trinity-tdesdk' 'trinity-kdesdk')
-replaces=('trinity-tdesdk')
+makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz")
-md5sums=('5d117cbbe1cd938624656917646eebab')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ee3b844a8dc81219100240e6f6ddf4bb')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD
index 56a4ecc2c..2cdfdf0fd 100644
--- a/arch/tde-devel/tde-tdevelop/PKGBUILD
+++ b/arch/tde-devel/tde-tdevelop/PKGBUILD
@@ -1,53 +1,51 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdevelop
-pkgver=14.0.10
+_mod=tdevelop
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdevelop'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Desktop Developer Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion')
-provides=('tdevelop')
-conflicts=('trinity-tdevelop' 'trinity-kdevelop')
-replaces=('trinity-tdevelop')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz"
- 'bp000-ba5f58bf.diff')
-md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
- 'e7519ea06bd63b4fc9aa7e0ac5076576')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3eb446016b6c55e2cca31ba236298bb3')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
-
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p ${srcdir}/build
cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
+ -DBUILD_ALL=ON \
-DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \
- -DWITH_VCS_ALL=ON \
- -DBUILD_ALL=ON
+ -DWITH_VCS_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff b/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff
deleted file mode 100644
index 9cd176d3a..000000000
--- a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff
+++ /dev/null
@@ -1,1238 +0,0 @@
-From ba5f58bf38a62eb83990951168951274c96a8e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Sun, 28 Feb 2021 00:15:56 +0000
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: reference to ‘data’ is ambiguous
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- buildtools/ada/adaproject_part.cpp | 6 +++---
- buildtools/ant/antprojectpart.cpp | 6 +++---
- buildtools/autotools/autoprojectpart.cpp | 6 +++---
- buildtools/custommakefiles/customprojectpart.cpp | 6 +++---
- buildtools/pascal/pascalproject_part.cpp | 6 +++---
- buildtools/qmake/trollprojectpart.cpp | 6 +++---
- buildtools/script/scriptprojectpart.cpp | 6 +++---
- editors/editor-chooser/editorchooser_part.cpp | 6 +++---
- embedded/visualboyadvance/visualboyadvance_part.cpp | 6 +++---
- languages/ada/adasupportpart.cpp | 6 +++---
- languages/bash/bashsupport_part.cpp | 6 +++---
- languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 6 +++---
- languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 6 +++---
- languages/cpp/cppsupportfactory.cpp | 6 +++---
- languages/csharp/csharpsupportpart.cpp | 6 +++---
- languages/fortran/fortransupportpart.cpp | 6 +++---
- languages/java/javasupportfactory.cpp | 6 +++---
- languages/kjssupport/kjssupport_part.cpp | 6 +++---
- languages/pascal/pascalsupport_part.cpp | 6 +++---
- languages/perl/perlsupportpart.cpp | 6 +++---
- languages/php/phpsupportpart.cpp | 6 +++---
- languages/python/pythonsupportpart.cpp | 6 +++---
- languages/ruby/rubysupport_part.cpp | 6 +++---
- languages/sql/sqlsupport_part.cpp | 6 +++---
- lib/interfaces/kdevgenericfactory.h | 8 ++++----
- parts/astyle/astyle_part.cpp | 6 +++---
- parts/bookmarks/bookmarks_part.cpp | 6 +++---
- parts/classview/classviewpart.cpp | 8 ++++----
- parts/ctags2/ctags2_part.cpp | 6 +++---
- parts/diff/diffpart.cpp | 6 +++---
- parts/distpart/distpart_part.cpp | 6 +++---
- parts/documentation/documentation_part.cpp | 6 +++---
- parts/doxygen/doxygenpart.cpp | 6 +++---
- parts/filecreate/filecreate_part.cpp | 8 ++++----
- parts/fileselector/fileselector_part.cpp | 6 +++---
- parts/fileview/filegroupspart.cpp | 6 +++---
- parts/fileview/fileviewpart.cpp | 6 +++---
- parts/filter/filterpart.cpp | 6 +++---
- parts/fullscreen/fullscreen_part.cpp | 6 +++---
- parts/outputviews/appoutputviewpart.cpp | 6 +++---
- parts/outputviews/makeviewpart.cpp | 6 +++---
- parts/partexplorer/partexplorer_plugin.cpp | 6 +++---
- parts/quickopen/quickopen_part.cpp | 6 +++---
- parts/regexptest/regexptestpart.cpp | 6 +++---
- parts/scripting/scriptingpart.cpp | 6 +++---
- parts/snippet/snippet_part.cpp | 6 +++---
- parts/texttools/texttoolspart.cpp | 6 +++---
- parts/tipofday/tipofday_part.cpp | 6 +++---
- parts/tools/tools_part.cpp | 6 +++---
- parts/uimode/uichooser_part.cpp | 6 +++---
- parts/valgrind/valgrind_part.cpp | 6 +++---
- parts/vcsmanager/vcsmanagerpart.cpp | 6 +++---
- vcs/clearcase/clearcasepart.cpp | 6 +++---
- vcs/cvsservice/cvspart.cpp | 6 +++---
- vcs/perforce/perforcepart.cpp | 6 +++---
- vcs/subversion/subversion_part.cpp | 6 +++---
- 56 files changed, 171 insertions(+), 171 deletions(-)
-
-diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
-index 5eacf5d0..f778c9b2 100644
---- a/buildtools/ada/adaproject_part.cpp
-+++ b/buildtools/ada/adaproject_part.cpp
-@@ -43,11 +43,11 @@
- #include "adaglobaloptionsdlg.h"
-
- typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
--static const KDevPluginInfo data("kdevadaproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevadaproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) )
-
- AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
-+ :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" )
- {
- setInstance(AdaProjectFactory::instance());
- setXMLFile("kdevadaproject.rc");
-diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
-index a9e5a2d4..f53357da 100644
---- a/buildtools/ant/antprojectpart.cpp
-+++ b/buildtools/ant/antprojectpart.cpp
-@@ -35,8 +35,8 @@
-
-
- typedef KDevGenericFactory<AntProjectPart> AntProjectFactory;
--static const KDevPluginInfo data("kdevantproject");
--K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data ))
-+static const KDevPluginInfo pluginData("kdevantproject");
-+K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData ))
-
-
- AntOptions::AntOptions()
-@@ -46,7 +46,7 @@ AntOptions::AntOptions()
-
-
- AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart")
- {
- setInstance(AntProjectFactory::instance());
-
-diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
-index 014e8e2f..c1008072 100644
---- a/buildtools/autotools/autoprojectpart.cpp
-+++ b/buildtools/autotools/autoprojectpart.cpp
-@@ -62,12 +62,12 @@
- #define RUN_OPTIONS 2
- #define MAKE_OPTIONS 3
-
--static const KDevPluginInfo data("kdevautoproject");
-+static const KDevPluginInfo pluginData("kdevautoproject");
-
--K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) )
-
- AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-- : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart")
- , m_lastCompilationFailed(false)
- {
- setInstance(AutoProjectFactory::instance());
-diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
-index f61782ae..cbbb4315 100644
---- a/buildtools/custommakefiles/customprojectpart.cpp
-+++ b/buildtools/custommakefiles/customprojectpart.cpp
-@@ -62,11 +62,11 @@
- #include <kdevplugininfo.h>
-
- typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
--static const KDevPluginInfo data( "kdevcustomproject" );
--K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
-+static const KDevPluginInfo pluginData( "kdevcustomproject" );
-+K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) )
-
- CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
-+ : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" )
- , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
- {
- setInstance( CustomProjectFactory::instance() );
-diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
-index 98127f0a..d4670adb 100644
---- a/buildtools/pascal/pascalproject_part.cpp
-+++ b/buildtools/pascal/pascalproject_part.cpp
-@@ -49,11 +49,11 @@
- #include <kdevplugininfo.h>
-
- typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
--static const KDevPluginInfo data("kdevpascalproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpascalproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) )
-
- PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
-+ :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" )
- {
- setInstance(PascalProjectFactory::instance());
- setXMLFile("kdevpascalproject.rc");
-diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
-index fe16d538..82bb7416 100644
---- a/buildtools/qmake/trollprojectpart.cpp
-+++ b/buildtools/qmake/trollprojectpart.cpp
-@@ -57,11 +57,11 @@
- #include <urlutil.h>
-
- typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
--static const KDevPluginInfo data("kdevtrollproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtrollproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) )
-
- TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-- : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart")
- {
- setInstance(TrollProjectFactory::instance());
-
-diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
-index 8f6b5fb4..42ce8935 100644
---- a/buildtools/script/scriptprojectpart.cpp
-+++ b/buildtools/script/scriptprojectpart.cpp
-@@ -37,11 +37,11 @@
- #include "kdevplugininfo.h"
-
- typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
--static const KDevPluginInfo data("kdevscriptproject");
--K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevscriptproject");
-+K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) )
-
- ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
-+ : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart")
- {
- setInstance(ScriptProjectFactory::instance());
-
-diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
-index a9a4339a..c700823d 100644
---- a/editors/editor-chooser/editorchooser_part.cpp
-+++ b/editors/editor-chooser/editorchooser_part.cpp
-@@ -13,11 +13,11 @@
- #include "editorchooser_widget.h"
-
- typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
--static const KDevPluginInfo data("kdeveditorchooser");
--K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
-+static const KDevPluginInfo pluginData("kdeveditorchooser");
-+K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( pluginData ) )
-
- EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "EditorChooserPart")
- {
- setInstance(EditorChooserFactory::instance());
-
-diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
-index 6abe66c5..effee085 100644
---- a/embedded/visualboyadvance/visualboyadvance_part.cpp
-+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
-@@ -20,11 +20,11 @@
- using namespace VisualBoyAdvance;
-
- typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
--static const KDevPluginInfo data("kdevvisualboyadvance");
--K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevvisualboyadvance");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( pluginData ) )
-
- VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name){
-+ : KDevPlugin(&pluginData, parent, name){
- setInstance(VisualBoyAdvanceFactory::instance());
-
- setXMLFile("kdevpart_visualboyadvance.rc");
-diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
-index 0d87f0a7..1ca3abfd 100644
---- a/languages/ada/adasupportpart.cpp
-+++ b/languages/ada/adasupportpart.cpp
-@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 };
-
- typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
-
--static const KDevPluginInfo data("kdevadasupport");
--K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
-+static const KDevPluginInfo pluginData("kdevadasupport");
-+K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData))
-
-
- struct AdaSupportPartData {
-@@ -51,7 +51,7 @@ struct AdaSupportPartData {
- };
-
- AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
-+ : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
- {
- setInstance (AdaSupportPartFactory::instance ());
-
-diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
-index 7e30b913..ca289234 100644
---- a/languages/bash/bashsupport_part.cpp
-+++ b/languages/bash/bashsupport_part.cpp
-@@ -33,11 +33,11 @@
- #include <codemodel.h>
-
- typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
--static const KDevPluginInfo data("kdevbashsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevbashsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) )
-
- BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
--: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
-+: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" )
- {
- setInstance(BashSupportFactory::instance());
- setXMLFile("kdevbashsupport.rc");
-diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-index aa950c8a..6a2559ba 100644
---- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
-@@ -22,14 +22,14 @@
- #include "%{APPNAMELC}projectconfig.h"
-
- typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
--KDevPluginInfo data("kdev%{APPNAMELC}");
--K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
-+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
-+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
-+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
- {
- setInstance(%{APPNAME}Factory::instance());
- setXMLFile("kdev%{APPNAMELC}.rc");
-diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-index aa950c8a..6a2559ba 100644
---- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
-@@ -22,14 +22,14 @@
- #include "%{APPNAMELC}projectconfig.h"
-
- typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
--KDevPluginInfo data("kdev%{APPNAMELC}");
--K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
-+KDevPluginInfo pluginData("kdev%{APPNAMELC}");
-+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) );
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
-+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part")
- {
- setInstance(%{APPNAME}Factory::instance());
- setXMLFile("kdev%{APPNAMELC}.rc");
-diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp
-index 5d11ab04..cf5ff24a 100644
---- a/languages/cpp/cppsupportfactory.cpp
-+++ b/languages/cpp/cppsupportfactory.cpp
-@@ -16,10 +16,10 @@
-
- K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory )
-
--static const KDevPluginInfo data("kdevcppsupport");
-+static const KDevPluginInfo pluginData("kdevcppsupport");
-
- CppSupportFactory::CppSupportFactory()
--: KDevGenericFactory<CppSupportPart>( data )
-+: KDevGenericFactory<CppSupportPart>( pluginData )
- {
- }
-
-@@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance()
-
- const KDevPluginInfo * CppSupportFactory::info()
- {
-- return &data;
-+ return &pluginData;
- }
-diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
-index 6da33030..8ecb44eb 100644
---- a/languages/csharp/csharpsupportpart.cpp
-+++ b/languages/csharp/csharpsupportpart.cpp
-@@ -45,11 +45,11 @@
- //#include "programmingbycontract.h"
-
- typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
--static const KDevPluginInfo data("kdevcsharpsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevcsharpsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) )
-
- CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart")
- {
- setInstance(CSharpSupportFactory::instance());
-
-diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
-index 4f749ed3..170ff230 100644
---- a/languages/fortran/fortransupportpart.cpp
-+++ b/languages/fortran/fortransupportpart.cpp
-@@ -45,11 +45,11 @@
-
-
- typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
--static const KDevPluginInfo data("kdevfortransupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfortransupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) )
-
- FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart")
- {
- setInstance(FortranSupportFactory::instance());
-
-diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
-index 94e435f2..299e283f 100644
---- a/languages/java/javasupportfactory.cpp
-+++ b/languages/java/javasupportfactory.cpp
-@@ -14,11 +14,11 @@
- #include <kdevplugininfo.h>
- #include "javasupportfactory.h"
-
--static const KDevPluginInfo data("kdevjavasupport");
-+static const KDevPluginInfo pluginData("kdevjavasupport");
- K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
-
- JavaSupportFactory::JavaSupportFactory()
-- : KDevGenericFactory<JavaSupportPart>( data )
-+ : KDevGenericFactory<JavaSupportPart>( pluginData )
- {
- }
-
-@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance()
-
- const KDevPluginInfo *JavaSupportFactory::info()
- {
-- return &data;
-+ return &pluginData;
- }
-
-diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
-index 5a00e9c6..71c680b4 100644
---- a/languages/kjssupport/kjssupport_part.cpp
-+++ b/languages/kjssupport/kjssupport_part.cpp
-@@ -50,8 +50,8 @@
- #include "subclassingdlg.h"
-
- typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
--static const KDevPluginInfo data("kdevkjssupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
-+static const KDevPluginInfo pluginData("kdevkjssupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) );
-
-
- class typeProperty
-@@ -63,7 +63,7 @@ class typeProperty
- };
-
- kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
--: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
-+: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" )
- {
- setInstance(kjsSupportFactory::instance());
- setXMLFile("kdevkjssupport.rc");
-diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
-index a61ab6a0..90532c22 100644
---- a/languages/pascal/pascalsupport_part.cpp
-+++ b/languages/pascal/pascalsupport_part.cpp
-@@ -44,11 +44,11 @@ struct PascalSupportPartData{
- };
-
- typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
--static const KDevPluginInfo data("kdevpascalsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpascalsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) )
-
- PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ),
- d( new PascalSupportPartData() )
- {
- setInstance(PascalSupportFactory::instance());
-diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
-index 3236e72e..1bcbb96b 100644
---- a/languages/perl/perlsupportpart.cpp
-+++ b/languages/perl/perlsupportpart.cpp
-@@ -45,11 +45,11 @@
- //#include "programmingbycontract.h"
-
- typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
--static const KDevPluginInfo data("kdevperlsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevperlsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) )
-
- PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart")
- {
- setInstance(PerlSupportFactory::instance());
-
-diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
-index c189cc5c..252b2167 100644
---- a/languages/php/phpsupportpart.cpp
-+++ b/languages/php/phpsupportpart.cpp
-@@ -66,11 +66,11 @@
-
- using namespace std;
-
--static const KDevPluginInfo data("kdevphpsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevphpsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) )
-
- PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart")
- {
- m_htmlView = 0;
- m_parser = 0;
-diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
-index e7529c2f..68baf71e 100644
---- a/languages/python/pythonsupportpart.cpp
-+++ b/languages/python/pythonsupportpart.cpp
-@@ -39,11 +39,11 @@
- #include "pythonimplementationwidget.h"
-
- typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
--static const KDevPluginInfo data("kdevpythonsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevpythonsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) )
-
- PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
-+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart")
- {
- setInstance(PythonSupportFactory::instance());
-
-diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
-index e61d7cef..db9576b3 100644
---- a/languages/ruby/rubysupport_part.cpp
-+++ b/languages/ruby/rubysupport_part.cpp
-@@ -38,11 +38,11 @@
- #include <codemodel_utils.h>
-
- typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
--static const KDevPluginInfo data("kdevrubysupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevrubysupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) )
-
- RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
-+ : KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" )
- {
- setInstance(RubySupportFactory::instance());
- setXMLFile("kdevrubysupport.rc");
-diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
-index e676cee5..96e8ed4f 100644
---- a/languages/sql/sqlsupport_part.cpp
-+++ b/languages/sql/sqlsupport_part.cpp
-@@ -30,11 +30,11 @@
- #include "domutil.h"
-
- typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
--static const KDevPluginInfo data("kdevsqlsupport");
--K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevsqlsupport");
-+K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) )
-
- SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
-- : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
-+ : KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" )
- {
- setInstance( SQLSupportFactory::instance() );
- setXMLFile( "kdevsqlsupport.rc" );
-diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
-index 6f8d3dc9..7bca8db4 100644
---- a/lib/interfaces/kdevgenericfactory.h
-+++ b/lib/interfaces/kdevgenericfactory.h
-@@ -33,7 +33,7 @@ to create factories for TDevelop plugins. For example, for DummyPlugin
- the factory can be created (in dummyplugin.cpp file) as:
- @code
- typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
--K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
- @endcode
- Data should be a const static object. This way it complies with the requirements
- for data objecs of KDevGenericFactory constructor.
-@@ -47,12 +47,12 @@ For example, dummyplugin.cpp file could contain:
- @code
- #include <kdevplugininfo.h>
-
--static const KDevPluginInfo data("KDevDummyPlugin");
-+static const KDevPluginInfo pluginData("KDevDummyPlugin");
- typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
--K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) )
-
- DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-- :KDevPlugin(&data, parent, name)
-+ :KDevPlugin(&pluginData, parent, name)
- {
- }
- @endcode
-diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
-index f5b5e2e7..6f9198b0 100644
---- a/parts/astyle/astyle_part.cpp
-+++ b/parts/astyle/astyle_part.cpp
-@@ -33,7 +33,7 @@
- #include "astyle_widget.h"
- #include "astyle_adaptor.h"
-
--static const KDevPluginInfo data("kdevastyle");
-+static const KDevPluginInfo pluginData("kdevastyle");
-
- namespace {
- const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
-@@ -41,10 +41,10 @@ namespace {
-
-
- typedef KDevGenericFactory<AStylePart> AStyleFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) )
-
- AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
-+ : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart")
- {
- setInstance(AStyleFactory::instance());
-
-diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
-index 2d5a0a10..04fee8d7 100644
---- a/parts/bookmarks/bookmarks_part.cpp
-+++ b/parts/bookmarks/bookmarks_part.cpp
-@@ -41,11 +41,11 @@
- #define BOOKMARKSETTINGSPAGE 1
-
- typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
--static const KDevPluginInfo data("kdevbookmarks");
--K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevbookmarks");
-+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) )
-
- BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" )
- {
- setInstance(BookmarksFactory::instance());
-
-diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
-index 92e26bd0..d068adaa 100644
---- a/parts/classview/classviewpart.cpp
-+++ b/parts/classview/classviewpart.cpp
-@@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter {
-
-
- typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
--static const KDevPluginInfo data("kdevclassview");
--K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevclassview");
-+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) )
-
- ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-- :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-- KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
-+ :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ),
-+ KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ),
- m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
- {
- setInstance(ClassViewFactory::instance());
-diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
-index 92dd4dc7..1333ac54 100644
---- a/parts/ctags2/ctags2_part.cpp
-+++ b/parts/ctags2/ctags2_part.cpp
-@@ -55,11 +55,11 @@ namespace ctags
- }
-
- typedef KDevGenericFactory<CTags2Part> CTags2Factory;
--static const KDevPluginInfo data("kdevctags2");
--K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
-+static const KDevPluginInfo pluginData("kdevctags2");
-+K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) )
-
- CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" )
- {
- setInstance(CTags2Factory::instance());
- setXMLFile("kdevpart_ctags2.rc");
-diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
-index 01c703d0..eb2063c4 100644
---- a/parts/diff/diffpart.cpp
-+++ b/parts/diff/diffpart.cpp
-@@ -36,13 +36,13 @@
- #include "diffdlg.h"
- #include "diffwidget.h"
-
--static const KDevPluginInfo data("kdevdiff");
-+static const KDevPluginInfo pluginData("kdevdiff");
-
- typedef KDevGenericFactory<DiffPart> DiffFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) )
-
- DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
-+ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0)
- {
- setInstance(DiffFactory::instance());
- setXMLFile("kdevdiff.rc");
-diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
-index e8a3e11a..fd235a0a 100644
---- a/parts/distpart/distpart_part.cpp
-+++ b/parts/distpart/distpart_part.cpp
-@@ -34,11 +34,11 @@
- #include <kdialogbase.h>
-
- typedef KDevGenericFactory<DistpartPart> DistpartFactory;
--static const KDevPluginInfo data("kdevdistpart");
--K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevdistpart");
-+K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) )
-
- DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
-+ : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") {
-
- kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
- setInstance(DistpartFactory::instance());
-diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
-index 3b9e9b78..1d284a64 100644
---- a/parts/documentation/documentation_part.cpp
-+++ b/parts/documentation/documentation_part.cpp
-@@ -72,13 +72,13 @@
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
--static const KDevPluginInfo data("kdevdocumentation");
-+static const KDevPluginInfo pluginData("kdevdocumentation");
-
- typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) )
-
- DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-- :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
-+ :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ),
- m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
- {
- setInstance(DocumentationFactory::instance());
-diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
-index d965d98b..36d41e8d 100644
---- a/parts/doxygen/doxygenpart.cpp
-+++ b/parts/doxygen/doxygenpart.cpp
-@@ -48,11 +48,11 @@
- #define PROJECTOPTIONS 1
-
- typedef KDevGenericFactory<DoxygenPart> DoxygenFactory;
--static const KDevPluginInfo data("kdevdoxygen");
--K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevdoxygen");
-+K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) )
-
- DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
-+ : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
- {
- setInstance(DoxygenFactory::instance());
- setXMLFile("kdevdoxygen.rc");
-diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
-index 1c371177..a1529097 100644
---- a/parts/filecreate/filecreate_part.cpp
-+++ b/parts/filecreate/filecreate_part.cpp
-@@ -54,16 +54,16 @@
-
- #include "config.h"
-
--static const KDevPluginInfo data("kdevfilecreate");
-+static const KDevPluginInfo pluginData("kdevfilecreate");
-
- typedef KDevGenericFactory<FileCreatePart> FileCreateFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) )
-
- using namespace FileCreate;
-
- FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
--// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-- : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
-+// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-+ : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0)
- {
- setInstance(FileCreateFactory::instance());
- setXMLFile("kdevpart_filecreate.rc");
-diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
-index b5f9961a..de9b5fef 100644
---- a/parts/fileselector/fileselector_part.cpp
-+++ b/parts/fileselector/fileselector_part.cpp
-@@ -31,11 +31,11 @@
- #include "fileselector_widget.h"
-
- typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
--static const KDevPluginInfo data("kdevfileselector");
--K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfileselector");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) )
-
- FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart")
- {
- setInstance(FileSelectorFactory::instance());
-
-diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
-index 77fc9646..91b1a0bc 100644
---- a/parts/fileview/filegroupspart.cpp
-+++ b/parts/fileview/filegroupspart.cpp
-@@ -33,11 +33,11 @@
- #define FILEGROUPS_OPTIONS 1
-
- typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
--static const KDevPluginInfo data("kdevfilegroups");
--K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfilegroups");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) )
-
- FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart")
- {
- deleteRequested = false;
- setInstance(FileGroupsFactory::instance());
-diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
-index 414cea52..25aa8f62 100644
---- a/parts/fileview/fileviewpart.cpp
-+++ b/parts/fileview/fileviewpart.cpp
-@@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors;
- ///////////////////////////////////////////////////////////////////////////////
-
- typedef KDevGenericFactory<FileViewPart> FileViewFactory;
--static const KDevPluginInfo data("kdevfileview");
--K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfileview");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) )
-
- ///////////////////////////////////////////////////////////////////////////////
- // class FileTreeWidget
- ///////////////////////////////////////////////////////////////////////////////
-
- FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FileViewPart"),
-+ : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"),
- m_widget( 0 )
- {
- setInstance( FileViewFactory::instance() );
-diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
-index 5ebd265e..3a1351ad 100644
---- a/parts/filter/filterpart.cpp
-+++ b/parts/filter/filterpart.cpp
-@@ -26,11 +26,11 @@
- #include "shellinsertdlg.h"
- #include "kdevfilterIface.h"
-
--static const KDevPluginInfo data("kdevfilter");
--K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevfilter");
-+K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) )
-
- FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "FilterPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "FilterPart")
- {
- setInstance(FilterFactory::instance());
- setXMLFile("kdevfilter.rc");
-diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
-index 0bdc714f..98581a9c 100644
---- a/parts/fullscreen/fullscreen_part.cpp
-+++ b/parts/fullscreen/fullscreen_part.cpp
-@@ -22,13 +22,13 @@
-
- #include "fullscreen_part.h"
-
--static const KDevPluginInfo data("kdevfullscreen");
-+static const KDevPluginInfo pluginData("kdevfullscreen");
-
- typedef KDevGenericFactory<FullScreenPart> FullScreenFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) )
-
- FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" )
- {
- setInstance(FullScreenFactory::instance());
- // const TDEAboutData &abdata1 = *(info());
-diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
-index 3a0e0e7d..3d8b47bf 100644
---- a/parts/outputviews/appoutputviewpart.cpp
-+++ b/parts/outputviews/appoutputviewpart.cpp
-@@ -29,12 +29,12 @@
- #include "kdevpartcontroller.h"
- #include "settings.h"
-
--static const KDevPluginInfo data("kdevappoutputview");
-+static const KDevPluginInfo pluginData("kdevappoutputview");
- typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) )
-
- AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
-+ : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart")
- {
- setInstance(AppViewFactory::instance());
-
-diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
-index 8b441e94..2df7d384 100644
---- a/parts/outputviews/makeviewpart.cpp
-+++ b/parts/outputviews/makeviewpart.cpp
-@@ -26,12 +26,12 @@
-
- #include "makewidget.h"
-
--static const KDevPluginInfo data("kdevmakeview");
-+static const KDevPluginInfo pluginData("kdevmakeview");
- typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) )
-
- MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevMakeFrontend(&data, parent, name)
-+ : KDevMakeFrontend(&pluginData, parent, name)
- {
- setInstance(MakeViewFactory::instance());
-
-diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
-index d5240edb..57b1cd58 100644
---- a/parts/partexplorer/partexplorer_plugin.cpp
-+++ b/parts/partexplorer/partexplorer_plugin.cpp
-@@ -23,13 +23,13 @@
-
- #include "partexplorerform.h"
-
--static const KDevPluginInfo data("kdevpartexplorer");
-+static const KDevPluginInfo pluginData("kdevpartexplorer");
-
- typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) )
-
- PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & )
-- : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
-+ : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" )
- {
- // we need an instance
- setInstance( PartExplorerPluginFactory::instance() );
-diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
-index 4d316e68..78c97eb6 100644
---- a/parts/quickopen/quickopen_part.cpp
-+++ b/parts/quickopen/quickopen_part.cpp
-@@ -44,13 +44,13 @@
- #include "kdeveditorutil.h"
-
- typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory;
--static const KDevPluginInfo data("kdevquickopen");
--K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevquickopen");
-+K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) )
-
- using namespace KTextEditor;
-
- QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
-+ : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" )
- {
- setInstance(QuickOpenFactory::instance());
- setXMLFile("kdevpart_quickopen.rc");
-diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
-index 6c45a492..1e16d144 100644
---- a/parts/regexptest/regexptestpart.cpp
-+++ b/parts/regexptest/regexptestpart.cpp
-@@ -19,13 +19,13 @@
- #include "kdevcore.h"
- #include "regexptestdlg.h"
-
--static const KDevPluginInfo data("kdevregexptest");
-+static const KDevPluginInfo pluginData("kdevregexptest");
-
- typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) )
-
- RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart")
- {
- setInstance(RegexpTestFactory::instance());
- setXMLFile("kdevregexptest.rc");
-diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
-index 80a33c9e..d0558b79 100644
---- a/parts/scripting/scriptingpart.cpp
-+++ b/parts/scripting/scriptingpart.cpp
-@@ -41,14 +41,14 @@
- #include "tdescriptactionmanager.h"
-
- typedef KDevGenericFactory<scriptingPart> scriptingFactory;
--KDevPluginInfo data("kdevscripting");
--K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
-+KDevPluginInfo pluginData("kdevscripting");
-+K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) )
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
-+ : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L)
- {
- setInstance(scriptingFactory::instance());
- setXMLFile("kdevscripting.rc");
-diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
-index 82969151..1c650ce2 100644
---- a/parts/snippet/snippet_part.cpp
-+++ b/parts/snippet/snippet_part.cpp
-@@ -33,12 +33,12 @@
- #include "snippetsettings.h"
- #include "snippetconfig.h"
-
--static const KDevPluginInfo data("kdevsnippet");
-+static const KDevPluginInfo pluginData("kdevsnippet");
- typedef KDevGenericFactory<SnippetPart> snippetFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) )
-
- SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
-+ : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" )
- {
- setInstance(snippetFactory::instance());
- setXMLFile("kdevpart_snippet.rc");
-diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
-index 4453030a..7e38f061 100644
---- a/parts/texttools/texttoolspart.cpp
-+++ b/parts/texttools/texttoolspart.cpp
-@@ -25,11 +25,11 @@
-
-
- typedef KDevGenericFactory<TextToolsPart> TextToolsFactory;
--static const KDevPluginInfo data("kdevtexttools");
--K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtexttools");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) )
-
- TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart")
- {
- setInstance(TextToolsFactory::instance());
- // setXMLFile("kdevfileview.rc");
-diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
-index 6cd63deb..9172d44b 100644
---- a/parts/tipofday/tipofday_part.cpp
-+++ b/parts/tipofday/tipofday_part.cpp
-@@ -19,13 +19,13 @@
- #include "kdevapi.h"
- #include "kdevcore.h"
-
--static const KDevPluginInfo data("kdevtipofday");
-+static const KDevPluginInfo pluginData("kdevtipofday");
-
- typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) )
-
- TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart")
- {
- setInstance(TipOfDayFactory::instance());
-
-diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
-index 8734eadc..61f962ad 100644
---- a/parts/tools/tools_part.cpp
-+++ b/parts/tools/tools_part.cpp
-@@ -34,13 +34,13 @@
- #define TOOLSSETTINGS 1
- #define EXTRATOOLSSETTINGS 2
-
--static const KDevPluginInfo data("kdevtools");
--K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevtools");
-+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) )
-
- TQMap<int, TQString> externalToolMenuEntries;
-
- ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin( &data, parent, name ? name : "ToolsPart")
-+ : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart")
- {
- setInstance(ToolsFactory::instance());
-
-diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
-index fdc9fa6a..a547bdef 100644
---- a/parts/uimode/uichooser_part.cpp
-+++ b/parts/uimode/uichooser_part.cpp
-@@ -15,11 +15,11 @@
- #define UICHOOSERSETTINGSPAGE 1
-
- typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
--static const KDevPluginInfo data("kdevuichooser");
--K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevuichooser");
-+K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) )
-
- UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-- : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
-+ : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart")
- {
- setInstance(UIChooserFactory::instance());
-
-diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
-index 1b262175..5c78d952 100644
---- a/parts/valgrind/valgrind_part.cpp
-+++ b/parts/valgrind/valgrind_part.cpp
-@@ -23,11 +23,11 @@
- #include "valgrinditem.h"
-
- typedef KDevGenericFactory<ValgrindPart> ValgrindFactory;
--static const KDevPluginInfo data("kdevvalgrind");
--K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
-+static const KDevPluginInfo pluginData("kdevvalgrind");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) )
-
- ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
-- : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
-+ : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" )
- {
- setInstance( ValgrindFactory::instance() );
- setXMLFile( "kdevpart_valgrind.rc" );
-diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
-index ec176c47..e8606636 100644
---- a/parts/vcsmanager/vcsmanagerpart.cpp
-+++ b/parts/vcsmanager/vcsmanagerpart.cpp
-@@ -42,14 +42,14 @@
- #include "vcsmanagerprojectconfig.h"
-
- typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory;
--KDevPluginInfo data("kdevvcsmanager");
--K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
-+KDevPluginInfo pluginData("kdevvcsmanager");
-+K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) )
-
- #define GLOBALDOC_OPTIONS 1
- #define PROJECTDOC_OPTIONS 2
-
- VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-- : KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
-+ : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart")
- {
- kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
-
-diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
-index aeb1eea9..8f05fbad 100644
---- a/vcs/clearcase/clearcasepart.cpp
-+++ b/vcs/clearcase/clearcasepart.cpp
-@@ -37,13 +37,13 @@
- #include "clearcasemanipulator.h"
-
-
--static const KDevPluginInfo data("kdevclearcase");
-+static const KDevPluginInfo pluginData("kdevclearcase");
-
- typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) )
-
- ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
-+ : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ),
- default_checkin(""),
- default_checkout(""),
- default_uncheckout("-rm"),
-diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
-index 2bda55f1..6ded6ecb 100644
---- a/vcs/cvsservice/cvspart.cpp
-+++ b/vcs/cvsservice/cvspart.cpp
-@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false;
- // Plugin factory
- ///////////////////////////////////////////////////////////////////////////////
-
--static const KDevPluginInfo data("kdevcvsservice");
-+static const KDevPluginInfo pluginData("kdevcvsservice");
- typedef KDevGenericFactory<CvsServicePart> CvsFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) )
-
- ///////////////////////////////////////////////////////////////////////////////
- // class CvsServicePart
- ///////////////////////////////////////////////////////////////////////////////
-
- CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent,
-+ : KDevVersionControl( &pluginData, parent,
- name ? name : "CvsService" ),
- actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
- actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),
-diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
-index f92666b6..76a4456a 100644
---- a/vcs/perforce/perforcepart.cpp
-+++ b/vcs/perforce/perforcepart.cpp
-@@ -33,13 +33,13 @@
- #include "commitdlg.h"
- #include "execcommand.h"
-
--static const KDevPluginInfo data("kdevperforce");
-+static const KDevPluginInfo pluginData("kdevperforce");
-
- typedef KDevGenericFactory<PerforcePart> PerforceFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) )
-
- PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-- : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
-+ : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" )
- {
- setInstance(PerforceFactory::instance());
- setupActions();
-diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
-index f3f43cd9..98b44848 100644
---- a/vcs/subversion/subversion_part.cpp
-+++ b/vcs/subversion/subversion_part.cpp
-@@ -56,15 +56,15 @@
-
- using namespace SvnGlobal;
-
--static const KDevPluginInfo data("kdevsubversion");
-+static const KDevPluginInfo pluginData("kdevsubversion");
-
- typedef KDevGenericFactory<subversionPart> subversionFactory;
--K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
-+K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) )
-
- //bool g_projectWasJustCreated = false;
-
- subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
-- : KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
-+ : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) {
- setInstance(subversionFactory::instance());
- m_projWidget = 0;
-
---
-cgit v1.2.1
-
diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD
index 0b2221cde..978b981c2 100644
--- a/arch/tde-devel/tde-tdewebdev/PKGBUILD
+++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD
@@ -1,43 +1,47 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdewebdev
-pkgver=14.0.10
+_mod=tdewebdev
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdewebdev'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-devel')
pkgdesc="Trinity Web Developer Tools"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdewebdev')
-conflicts=('trinity-tdewebdev' 'trinity-kdewebdev')
-replaces=('trinity-tdewebdev')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdewebdev-trinity-${pkgver}.tar.xz")
-md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('0e91af91e68fa79e12117c31690fda70')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD
index c8961c7d7..a6754eef6 100644
--- a/arch/tde-extra/tde-abakus/PKGBUILD
+++ b/arch/tde-extra/tde-abakus/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=abakus
-_cat=applications/
+_cat=applications/utilities/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.12
pkgrel=1
pkgdesc="Calculator for TDE"
arch=('i686' 'x86_64')
@@ -17,17 +18,16 @@ depends=(
'tde-tdelibs'
)
makedepends=(
- 'cmake'
- 'pkgconfig'
+ 'tde-cmake-trinity'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('90fa9e728b8b48ad5e51c95eb5d05dc7')
+md5sums=('40ad2a4afc8c3c982833b46baefd3b3e')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +39,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +47,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-akode/PKGBUILD b/arch/tde-extra/tde-akode/PKGBUILD
new file mode 100644
index 000000000..da8d0a8eb
--- /dev/null
+++ b/arch/tde-extra/tde-akode/PKGBUILD
@@ -0,0 +1,54 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=akode
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="akode plugin for aRts"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('alsa-plugins'
+ 'alsa-tools'
+ 'alsa-utils'
+ 'audiofile'
+ 'libmad'
+ 'libogg'
+ 'libvorbis'
+ 'pulseaudio-alsa')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('85e6dc1a63be5d401527643d79d269d5')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+ cd $srcdir
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p build
+ cd build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_JACK_SINK=OFF
+
+ msg "Building $pkgname..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-akode/tde-akode.install b/arch/tde-extra/tde-akode/tde-akode.install
new file mode 100644
index 000000000..30e6e407f
--- /dev/null
+++ b/arch/tde-extra/tde-akode/tde-akode.install
@@ -0,0 +1,11 @@
+post_install() {
+ ldconfig &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
index b87b39775..0dc0b2db0 100644
--- a/arch/tde-extra/tde-amarok/PKGBUILD
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -1,47 +1,68 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-amarok
-pkgver=14.0.10
+_mod=amarok
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE Amarok"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-amarok')
-#conflicts=('tde-amarok')
-#replaces=('tde-amarok')
+makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
-md5sums=('fab4ed783d4027711e4aaca098bb04b1')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+ 'bp000-fix-configure-tests.diff')
+md5sums=('bf63df52af7ea829fb07b3a2615bf30e'
+ '967ae8710e90d9e7a3a519ed08e437ed')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+prepare() {
+ msg "Apply backported patches"
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+ patch -p1 < ${srcdir}/bp000-fix-configure-tests.diff
+}
+
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_YAUAP=OFF \
+ -DWITH_NJB=OFF \
+ -DWITH_IFP=OFF \
+ -DWITH_IPOD=OFF \
+ -DWITH_MP4V2=OFF \
-DWITH_EMBEDDED_SQLITE=ON \
- -DWITH_OPENGL=ON
+ -DWITH_SYSTEM_SQLITE=OFF \
+ -DWITH_MYSQL=OFF \
+ -DWITH_POSTGRESQL=OFF \
+ -DWITH_AMAZON=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff b/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff
new file mode 100644
index 000000000..5668cc562
--- /dev/null
+++ b/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff
@@ -0,0 +1,28 @@
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index f1b7246b..bab3b80d 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -197,7 +197,10 @@ find_package( OpenGL )
+
+ tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+ set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
+-set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
++foreach( _dirs ${TQT_LIBRARY_DIRS} )
++ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
++endforeach()
++list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
+
+ check_cxx_source_compiles("
+ #include <cstdlib>
+@@ -219,7 +222,10 @@ if( WITH_KONQSIDEBAR )
+ set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
+ set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
+ set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
+- set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
++ foreach( _dirs ${TQT_LIBRARY_DIRS} )
++ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
++ endforeach()
++ list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
+ check_cxx_source_compiles("
+ #include <konqsidebarplugin.h>
+ int main(int, char**) { return 0; } "
diff --git a/arch/tde-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD
index 3e9a7a007..7458edf16 100644
--- a/arch/tde-extra/tde-basket/PKGBUILD
+++ b/arch/tde-extra/tde-basket/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=basket
-_cat=applications/
+_cat=applications/office/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.12
pkgrel=1
pkgdesc="A multi-purpose note-taking application for KDE"
arch=('i686' 'x86_64')
@@ -17,18 +18,17 @@ depends=(
'tde-tdelibs'
)
makedepends=(
- 'cmake'
- 'pkgconfig'
+ 'tde-cmake-trinity'
'tde-tdepim'
)
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('6a70768661d810eeeba5281075215803')
+md5sums=('7253c7c8c886fce5a882496824955fd3')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -42,6 +42,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -49,11 +50,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
index e72405c2f..ff2611e85 100644
--- a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-gtk-qt-engine
-pkgver=14.0.10
+_mod=gtk-qt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="gtk qt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs' 'gtk2')
-makedepends=('pkgconfig' 'cmake')
-#provides=('gtk-qt-engine')
-#conflicts=('gtk-qt-engine')
-#replaces=('gtk-qt-engine')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz")
-md5sums=('419342ad15dca93e5e4424eb7b0a2e59')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e07f2e577861adb6e0295effc32eff02')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p "$srcdir/build"
- cd "$srcdir/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
index f0f244d99..d2ca554d6 100644
--- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
+++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
@@ -1,25 +1,27 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-gtk3-tqt-engine
-pkgver=14.0.10
+_mod=gtk3-tqt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="gtk3 tqt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs' 'gtk3')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdemultimedia')
-#conflicts=('gtk3-tqt-engine')
-#replaces=('gtk3-tqt-engine')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz"
- 'bp000-0e2c727907.diff')
-md5sums=('1f94fd009a3c062e042f914c21d49984'
- '280b56843ebeb41b9ee74120b0ef28b6')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a3078835150c1c83dfe733fb0d730ad1')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -28,8 +30,6 @@ build() {
## Generate config files and update with autoreconf
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-0e2c727907.diff
-
msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff b/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff
deleted file mode 100644
index fd8dd3872..000000000
--- a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date: Fri Sep 24 14:54:59 2021 +0200
-
- Fix FTBFS in case TQt3 is not installed in the system directory.
-
- Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
- (cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989)
-
-diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am
-index 54a5db3..f1886dc 100644
---- a/tdegtk/Makefile.am
-+++ b/tdegtk/Makefile.am
-@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c)
- libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-
--libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
--
--libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-
- lib_LTLIBRARIES = libtqtcairo.la
-
-@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-
- libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI)
--
--libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
diff --git a/arch/tde-extra/tde-kile/PKGBUILD b/arch/tde-extra/tde-kile/PKGBUILD
new file mode 100644
index 000000000..d57e2b6eb
--- /dev/null
+++ b/arch/tde-extra/tde-kile/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kile
+_cat=applications/office/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="TDE Integrated LaTeX Environment"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+ 'tde-tdelibs'
+)
+makedepends=(
+ 'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('03b36fb00b27ce2df4f4ef8b91abed8f')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+ msg "Removing conflicting syntax files"
+ rm -rf ${pkgdir}/opt/trinity/share/apps/katepart
+}
diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD
index b7d17b979..049480cf3 100644
--- a/arch/tde-extra/tde-kmplayer/PKGBUILD
+++ b/arch/tde-extra/tde-kmplayer/PKGBUILD
@@ -1,48 +1,53 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-kmplayer
-pkgver=14.0.10
+_mod=kmplayer
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE KMPlayer"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib')
-makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
-#provides=('kmplayer')
-#conflicts=('kmplayer')
-#replaces=('kmplayer')
+makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz")
-md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('00e1b5dc90d38c6b1f85cc86ce31d5b0')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DBUILD_KOFFICE_PLUGIN=OFF \
- -DBUILD_KGSTPLAYER=OFF
+ -DBUILD_KGSTPLAYER=OFF \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-kmymoney/PKGBUILD b/arch/tde-extra/tde-kmymoney/PKGBUILD
new file mode 100644
index 000000000..f0aa5b39e
--- /dev/null
+++ b/arch/tde-extra/tde-kmymoney/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kmymoney
+_cat=applications/office/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="Personal finance manager for TDE"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+ 'tde-tdelibs'
+ 'libofx'
+)
+makedepends=(
+ 'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ce63a58983e8e5400861f0b3d782e6c9')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_DEVELOPER_DOCS="OFF"
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD
index 2688b1bec..48b669da2 100644
--- a/arch/tde-extra/tde-krusader/PKGBUILD
+++ b/arch/tde-extra/tde-krusader/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-krusader
-pkgver=14.0.10
+_mod=krusader
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE Krusader"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/krusader'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
makedepends=('pkgconfig' 'automake')
-#provides=('krusader')
-#conflicts=('krusader')
-#replaces=('krusader')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/krusader-trinity-${pkgver}.tar.xz")
-md5sums=('1491538ca6e616ec5bdfaa9c9f86c9b2')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('08dca0604ad9c3ceb495cfb093d32e44')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
index 4735a9653..f168a4960 100644
--- a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
+++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
@@ -1,46 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-ksplash-engine-moodin
-pkgver=14.0.10
+_mod=ksplash-engine-moodin
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE KSplash Engine Moodin"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-#provides=('ksplash-engine-moodin')
-#conflicts=('ksplash-engine-moodin')
-#replaces=('ksplash-engine-moodin')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
-md5sums=('3a10d2089ed4e165ff74994e9efbf262')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('92d27418e368ae05cdbc212cb28660f1')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-style-domino/PKGBUILD b/arch/tde-extra/tde-style-domino/PKGBUILD
new file mode 100644
index 000000000..603671a8f
--- /dev/null
+++ b/arch/tde-extra/tde-style-domino/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tde-style-domino
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
+pkgrel=1
+pkgdesc="Domino widget style and twin decoration for TDE"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+ 'tde-tdebase'
+)
+makedepends=(
+ 'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('8253c84df5f816b5e031ba3f13554386')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
+}
+
+package() {
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
index 47d8524bc..04e30ca7d 100644
--- a/arch/tde-extra/tde-style-qtcurve/PKGBUILD
+++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-style-qtcurve
-pkgver=14.0.10
+_mod=tde-style-qtcurve
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE Style QTCurve"
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tde-style-qtcurve'
+url="http://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-style-qtcurve')
-#conflicts=('tde-style-qtcurve')
-#replaces=('tde-style-qtcurve')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-style-qtcurve-trinity-${pkgver}.tar.xz")
-md5sums=('b5bff2af06e5891d9b4bbeb5b3c83835')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ae19bf2b511b7da7f27f1ddc5979893e')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,17 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD
index b92314db6..554a1b0ee 100644
--- a/arch/tde-extra/tde-systemsettings/PKGBUILD
+++ b/arch/tde-extra/tde-systemsettings/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-systemsettings
-pkgver=14.0.10
+_mod=tde-systemsettings
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE System Settings"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tde-systemsettings')
-#conflicts=('tde-systemsettings')
-#replaces=('tde-systemsettings')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz")
-md5sums=('aa7b76706221850c5ef5519360247e7b')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('aed70440548689af112dd493b9587063')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,17 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON \
-DBUILD_KNETWORKCONF=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
index f0e578c38..21add833d 100644
--- a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
+++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
@@ -1,46 +1,50 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdeaccessibility
-pkgver=14.0.10
+_mod=tdeaccessibility
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Accessibility utilities for the TDE Desktop"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
+makedepends=('tde-cmake-trinity' 'tde-tdemultimedia')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz")
-md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4d45f1d2c9b5d4900cefeffc80c9d01a')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeaddons/PKGBUILD b/arch/tde-extra/tde-tdeaddons/PKGBUILD
index b3acc8363..fa594a0d0 100644
--- a/arch/tde-extra/tde-tdeaddons/PKGBUILD
+++ b/arch/tde-extra/tde-tdeaddons/PKGBUILD
@@ -1,46 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdeaddons
-pkgver=14.0.10
+_mod=tdeaddons
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeaddons'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Addons"
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim')
-provides=('tdeaddons')
-conflicts=('trinity-tdeaddons' 'trinity-kdeaddons')
-replaces=('trinity-tdeaddons')
+makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaddons-trinity-${pkgver}.tar.xz")
-md5sums=('27557921bf86569042c72d597b87c877')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c71cf752673ec1b4169dc5b5a0118ffe')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_XMMS=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD
index 05899c6f3..82d1ae384 100644
--- a/arch/tde-extra/tde-tdeedu/PKGBUILD
+++ b/arch/tde-extra/tde-tdeedu/PKGBUILD
@@ -1,51 +1,52 @@
# Maintainer: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdeedu
-pkgver=14.0.10
+_mod=tdeedu
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Educational utilities for the TDE Desktop"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
+makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
- 'bp000-0cb84fb9.diff')
-md5sums=('3859da24d70f0d787c0cc7f41540772d'
- '5ae3959dc2dc62f1f7421620b198d175')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e3490fae70dfb7f6a0c7763f11020399')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
-
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
- #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_OCAML_SOLVER=OFF \
+ -DWITH_LIBUSB=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff b/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
deleted file mode 100644
index 5dbe6e492..000000000
--- a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 09:15:26 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: static assertion failed: comparison object must be invocable as const
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- kiten/learn.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kiten/learn.cpp b/kiten/learn.cpp
-index 94e77b9a..a1b685d4 100644
---- a/kiten/learn.cpp
-+++ b/kiten/learn.cpp
-@@ -762,7 +762,7 @@ void Learn::qupdate()
-
- struct Learn::scoreCompare
- {
-- bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
-+ bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
- {
- return v1->text(4).toInt() < v2->text(4).toInt();
- }
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD
index 887916a87..c95ddfdba 100644
--- a/arch/tde-extra/tde-tdegames/PKGBUILD
+++ b/arch/tde-extra/tde-tdegames/PKGBUILD
@@ -1,46 +1,49 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdegames
-pkgver=14.0.10
+_mod=tdegames
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegames'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Games"
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdegames')
-conflicts=('trinity-tdegames' 'trinity-kdegames')
-replaces=('trinity-tdegames')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegames-trinity-${pkgver}.tar.xz")
-md5sums=('870352e848a991f1ff0045ef5590bc47')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('dce9a881d00f4187ef36f04aea1a7d17')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
index 092c6cd70..b23b2e4c3 100644
--- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD
+++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
@@ -1,49 +1,52 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdemultimedia
-pkgver=14.0.10
+_mod=tdemultimedia
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity Desktop MultiMedia Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
-depends=('tde-tdelibs' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdemultimedia')
-conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
-replaces=('trinity-tdemultimedia')
+depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz")
-md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5e1356fd402b11b9e774f2aa5c50985d')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_ALL_OPTIONS=ON \
- -DWITH_ARTS_AKODE=OFF \
-DBUILD_ALL=ON \
- -DBUILD_JUK=OFF
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GSTREAMER=OFF
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD
index 17c098fdb..378935813 100644
--- a/arch/tde-extra/tde-tdenetwork/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD
@@ -1,48 +1,60 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdenetwork
-pkgver=14.0.10
+_mod=tdenetwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdenetwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Network Components"
-depends=('tde-tdelibs' 'speex' 'wireless_tools' 'wpa_supplicant')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdenetwork')
-conflicts=('trinity-tdenetwork' 'trinity-kdenetwork')
-replaces=('trinity-tdenetwork')
+depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdenetwork-trinity-${pkgver}.tar.xz")
-md5sums=('c3d26523623fbcc65993a044bd83d0f6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5048cf9f889c2a8e8fd64c76224ee27f')
# install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
- export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
- -DWITH_SPEEX=ON \
- -DWITH_ARTS=ON \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_JINGLE=OFF \
+ -DWITH_SPEEX=OFF \
+ -DWITH_XMMS=OFF \
+ -DWITH_SLP=OFF \
+ -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+ -DBUILD_KOPETE_PROTOCOL_SMS=OFF \
+ -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \
+ -DBUILD_KOPETE_PLUGIN_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
index ce1489353..d11df23ab 100644
--- a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
@@ -1,55 +1,48 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdenetworkmanager
-pkgver=14.0.10
+_mod=tdenetworkmanager
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="gtk qt engine"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdenetworkmanager')
-#conflicts=('tdenetworkmanager')
-#replaces=('tdenetworkmanager')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=(
- "https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz"
- 'bp000-ea2b20ed7a.diff'
- 'bp001-e4e7853030.diff'
-)
-md5sums=(
- '2edab1bc48066a52f0b53a19457495a2'
- '40f95a5c7c02471e629e109aeca86ce3'
- 'd292626fb10780eb68bbc1a60c1e7ed7'
-)
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('79c8188473e95ca85b8fb8b438c810f7')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-ea2b20ed7a.diff
- patch -p1 < ${srcdir}/bp001-e4e7853030.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff b/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff
deleted file mode 100644
index 22abf310b..000000000
--- a/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-commit ea2b20ed7ab3e83b8585e20d2febdbb5f2d356c1
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date: Mon Aug 2 11:24:50 2021 +0900
-
- Removed unused hardwareEvent code.
-
- Initialization of TDEHardwareDevices() always happens before the signal
- was connected. The constructor of TDEHardwareDevices() is the only place
- that was triggering the signal emission, so the code was non functional.
-
- Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 5f1f26e..085435c 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -74,8 +74,6 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
-
- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-
-- // Listen for hardware change events
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
- // Trigger an initial hardware information update
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-
-diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
-index 9427679..173464f 100644
---- a/tdenetworkmanager/src/tdenetman-tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
-@@ -963,14 +963,6 @@ void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev)
- }
- }
-
--void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- updateDeviceTrays();
-- connectTrayDeviceManager();
-- }
--}
--
- void Tray::slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message)
- {
- if (event == TDENetworkVPNEventType::LoginBanner) {
-@@ -1094,7 +1086,6 @@ Tray::Tray() : KSystemTray()
- // get notified about new/removed devices
- connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
- connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*)));
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
-
- // Notifications
- connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
-diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
-index d086902..6f4fdea 100644
---- a/tdenetworkmanager/src/tdenetman-tray.h
-+++ b/tdenetworkmanager/src/tdenetman-tray.h
-@@ -115,7 +115,6 @@ class Tray : public KSystemTray
- private slots:
- void slotGenericDeviceAdded(TDEGenericDevice*);
- void slotGenericDeviceRemoved(TDEGenericDevice*);
-- void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message);
-
- private:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 2d4eccb..9b855ec 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -487,9 +487,6 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
-
-- // Listen for hardware change events
-- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
--
- // Trigger an initial hardware information update
- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
- }
diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff b/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff
deleted file mode 100644
index 887c989f1..000000000
--- a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff
+++ /dev/null
@@ -1,121 +0,0 @@
-commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date: Mon Aug 2 23:19:04 2021 +0900
-
- Removed unused hardwareEvent code - part 2.
-
- Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 085435c..2ea4e35 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-
- // Trigger an initial hardware information update
-- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+ TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
-+ TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-+
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
-
- m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection";
- m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection";
-@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const
- return m_device;
- }
-
--void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
-- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
-- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
--
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
-- }
--}
--
- void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) {
- kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl;
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
-index af0ccea..c3c40e1 100644
---- a/tdenetworkmanager/src/devicetraycomponent.h
-+++ b/tdenetworkmanager/src/devicetraycomponent.h
-@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent
- void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
-
- private slots:
-- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message);
-
- protected:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 9b855ec..8811650 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress)
- KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
- }
-
--void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
-- if (event == TDEHardwareEvent::HardwareListModified) {
-- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
-- TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL;
--
-- // get notified when the device state changes
-- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
--
-- // get notified of all AP changes
-- connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
--
-- // force status update to ensure correct icon is shown on startup
-- if ((dev) && (deviceConnMan)) {
-- slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
-- }
-- }
--}
--
- void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) {
- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
-
-- // Trigger an initial hardware information update
-- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+ // initial hardware information update
-+ TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
-+ TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL;
-+
-+ // get notified when the device state changes
-+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+
-+ // get notified of all AP changes
-+ connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
-+
-+ // force status update to ensure correct icon is shown on startup
-+ if ((netdev) && (deviceConnMan)) {
-+ slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode());
-+ }
- }
-
- WirelessDeviceTray::~WirelessDeviceTray ()
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-index 59a24a1..eb429b9 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent
- void slotAccessPointRemoved(TDEMACAddress);
-
- private slots:
-- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType);
- void sendUpdateUI();
-
diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD
index 9d00f1810..c87adf2c7 100644
--- a/arch/tde-extra/tde-tdepim/PKGBUILD
+++ b/arch/tde-extra/tde-tdepim/PKGBUILD
@@ -1,33 +1,36 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-tdepim
-pkgver=14.0.10
+_mod=tdepim
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="Trinity Desktop PIM Components"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdepim'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-tdelibs' 'tde-libcaldav' 'tde-libcarddav')
-makedepends=('pkgconfig' 'cmake' )
-provides=('tdepim')
-replaces=('trinity-tdepim')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdepim-trinity-${pkgver}.tar.xz")
-md5sums=('894562acd7c895da37d8af30b4f1fc61')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('9ddb88a43eb99aa811049465711f0b46')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
-
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_C_FLAGS="-fpermissive" \
-DCMAKE_CXX_FLAGS="-fpermissive" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -36,13 +39,13 @@ build() {
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
# Removing /opt/trinity/share/icons/default.tde to prevent a conflict
rm -rf ${pkgdir}/opt/trinity/share/icons/default.tde
}
diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD
index a9c5d20c5..d59974f7e 100644
--- a/arch/tde-extra/tde-tdepowersave/PKGBUILD
+++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD
@@ -2,34 +2,32 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=tdepowersave
-_cat=applications/
+_cat=applications/system/
_kdemod="${_mod/tde/kde}"
-pkgname="tde-$_mod"
-pkgver=14.0.10
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
-pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
+pkgdesc="Trinity Desktop Enviroment - ${_mod}"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/$_mod"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
-#provides=("$_mod")
+provides=("${_mod}")
groups=('tde-extra')
depends=(
'tde-tdelibs'
'tde-dbus-1-tqt'
'libxss'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod")
-#replaces=("trinity-$_mod")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/main/$_cat$_mod-trinity-$pkgver.tar.xz")
-md5sums=('64daecf2c9061f3797b2cab8f0ad347b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('68ce639931ea71db005f8d0b04e6056f')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -42,17 +40,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DBUILD_ALL=ON \
-DWITH_GCC_VISIBILITY=ON
msg "Building - ${pkgname#*-}..."
- make VERBOSE=1 $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD
index 07b0ff58b..d20cfb5cc 100644
--- a/arch/tde-extra/tde-tdesudo/PKGBUILD
+++ b/arch/tde-extra/tde-tdesudo/PKGBUILD
@@ -1,31 +1,30 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdesudo
-pkgver=14.0.10
+_mod=tdesudo
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE Sudo"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdesudo')
-#conflicts=('tdesudo')
-#replaces=('tdesudo')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz"
- 'bp000-1136b8150f.diff')
-md5sums=('ff1b28acd12998c216e4256ca94f795b'
- '6ba546544bfab644bbbba972f31a137b')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bb4b1a81fcf57661647dcafb8492e84c')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- patch -p1 < $srcdir/bp000-1136b8150f.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p $srcdir/build
cd $srcdir/build
@@ -34,16 +33,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff b/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
deleted file mode 100644
index 60bd6082c..000000000
--- a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 19:45:01 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero ('char*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- tdesudo/tdesudo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
-index c255d0f..83158ab 100644
---- a/tdesudo/tdesudo.cpp
-+++ b/tdesudo/tdesudo.cpp
-@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
- chmod(m_tmpname.ascii(),0644);
-
- QCStringList output;
-- while (fgets(buf, 1024, f) > 0)
-+ while (fgets(buf, 1024, f) != NULL)
- output += buf;
- if (pclose(f) < 0) {
- kdError() << k_lineinfo << "Could not run xauth.\n";
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD
index 9b2bbde2e..ad0835ae1 100644
--- a/arch/tde-extra/tde-tdetoys/PKGBUILD
+++ b/arch/tde-extra/tde-tdetoys/PKGBUILD
@@ -1,43 +1,46 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdetoys
-pkgver=14.0.10
+_mod=tdetoys
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdetoys'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Toys"
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdetoys')
-conflicts=('trinity-tdetoys' 'trinity-kdetoys')
-replaces=('trinity-tdetoys')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz")
-md5sums=('f91d22efed453b5053e2110782d85d93')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('716916107b87ec5cf16b8ca5c51b6d4c')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD
index c6c368ab2..5db2d9827 100644
--- a/arch/tde-extra/tde-tdmtheme/PKGBUILD
+++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD
@@ -1,22 +1,26 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-tdmtheme
-pkgver=14.0.10
+_mod=tdmtheme
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDM Theme"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
-#provides=('tdmtheme')
-#conflicts=('tdmtheme')
-#replaces=('tdmtheme')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz")
-md5sums=('b085fa2792024415fb2174633875adbe')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ab41cdf18750b0108458abf4f87d8bd5')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -27,16 +31,18 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DBUILD_ALL=ON
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD
index e5660beb6..335e18dd9 100644
--- a/arch/tde-extra/tde-tork/PKGBUILD
+++ b/arch/tde-extra/tde-tork/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=tork
-_cat=applications/
+_cat=applications/internet/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.12
pkgrel=1
pkgdesc="Anonymity manager for TDE"
arch=('i686' 'x86_64')
@@ -18,34 +19,27 @@ depends=(
'geoip'
'torsocks'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
- 'bp000-7576a4bf.diff')
-md5sums=('1f17070b8891a8fdd883b45cea74c72d'
- '132b051287bfbfd41e2c50110027525b')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c7be5ce0ed1cb5d4cfb6817adc74cfb6')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd ${srcdir}/${_mod}-trinity-${pkgver}
- patch -p1 < ${srcdir}/bp000-7576a4bf.diff
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p "$srcdir/build"
cd "$srcdir/build"
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -53,11 +47,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
deleted file mode 100644
index 64db42995..000000000
--- a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7576a4bfe86835552ede116488e70baae64df9e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 20:34:45 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero (‘TQListViewItem*’ and ‘int’)
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- src/torkview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/torkview.cpp b/src/torkview.cpp
-index 1dd8b5d..ce32aea 100644
---- a/src/torkview.cpp
-+++ b/src/torkview.cpp
-@@ -1312,7 +1312,7 @@ void torkView::activeServersUpdated( const TQStringList &servers)
- {
- if ((*it).isEmpty())
- continue;
-- if ( (tm = serverList->findItem((*it),1)) > 0){
-+ if ( (tm = serverList->findItem((*it),1)) != NULL){
- tm->setPixmap(0,TQPixmap(SmallIcon("tork_green")));
- }else{
- tm = new TQListViewItem(serverList, (*it));
---
-cgit v1.2.1
-
diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
index b23465403..52759c833 100644
--- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
+++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
@@ -1,54 +1,50 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
-pkgname=tde-twin-style-crystal
-pkgver=14.0.10
+_mod=twin-style-crystal
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="TDE TWin Style Crystal"
arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-extra')
depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-#provides=('twin-style-crystal')
-#conflicts=('twin-style-crystal')
-#replaces=('twin-style-crystal')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_kdemod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
-md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3752135a01154bb63996fceaf7c251a2')
+install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- ## Generate config files and update with autoreconf
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-
- msg "Copying system libtool files...."
- cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
- cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
-
- ## configure
- msg "Configuring - ${pkgname#*-}..."
- ./configure \
- --prefix=${TDEDIR} \
- --with-qt-dir=${QTDIR} \
- --with-qt-includes=${QTDIR}/include \
- --with-qt-libraries=${QTDIR}/lib \
- --sysconfdir=${TDEDIR}/etc \
- --localstatedir=/var \
- --enable-closure
-
- msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p "$srcdir/build"
+ cd "$srcdir/build"
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building - ${pkgname}..."
+ ninja $NUMJOBS
}
package() {
- msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
- make -j1 DESTDIR="${pkgdir}" install
+ msg "Packaging - ${pkgname}-${pkgver}"
+ cd "$srcdir/build"
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD
index 81977b50f..87886c30a 100644
--- a/arch/tde-extra/tde-yakuake/PKGBUILD
+++ b/arch/tde-extra/tde-yakuake/PKGBUILD
@@ -2,10 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
_mod=yakuake
-_cat=applications/
+_cat=applications/system/
_kdemod="${_mod/tde/kde}"
+
pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.12
pkgrel=1
pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology"
arch=('i686' 'x86_64')
@@ -16,18 +17,15 @@ groups=('tde-complete')
depends=(
'tde-tdelibs'
)
-makedepends=(
- 'cmake'
- 'pkgconfig'
-)
+makedepends=('tde-cmake-trinity')
optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('87c4355c77e561d36d35ea46b66f6375')
+md5sums=('d3836b4624ac1254fd2fb40b2e69341e')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +37,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+ -GNinja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +45,11 @@ build() {
-DWITH_ALL_OPTIONS=ON
msg "Building - ${pkgname}..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - ${pkgname}-${pkgver}"
cd "$srcdir/build"
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD
index ecd9051e5..04102921c 100644
--- a/arch/tde-libs/tde-libcaldav/PKGBUILD
+++ b/arch/tde-libs/tde-libcaldav/PKGBUILD
@@ -1,44 +1,47 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contribuitor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libcaldav
-pkgver=14.0.10
+_mod=libcaldav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcaldav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('curl' 'glib2')
-makedepends=('doxygen' 'pkgconfig' 'cmake')
+makedepends=('doxygen' 'tde-cmake-trinity')
optdepends=()
-provides=('libcaldav')
-# conflicts=()
-replaces=('trinity-libcaldav')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
-md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fe296650d0777cd2cd0edcb092b2cdb6')
_prefix=/usr
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DWITH_GCC_VISIBILITY=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD
index 96a67ea17..4120d5ae1 100644
--- a/arch/tde-libs/tde-libcarddav/PKGBUILD
+++ b/arch/tde-libs/tde-libcarddav/PKGBUILD
@@ -1,41 +1,45 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty@gmail.com>
-pkgname=tde-libcarddav
-pkgver=14.0.10
+_mod=libcarddav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="A client library adding support for the CardDAV protocol"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcarddav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
groups=('tde-libs')
depends=('curl')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
license=('GPL')
-provides=('libcarddav')
+provides=("${_mod}")
# conflicts=()
-replaces=('trinity-libcarddav')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
-md5sums=('54a5c89bb094ec40cc8cd5734233f743')
+replaces=("trinity-${_mod}")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fb818ef1597b4f5cb4028b25b7ca26c8')
_prefix=/usr
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DWITH_GCC_VISIBILITY=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD
index e6f6e58b6..bf2ab4815 100644
--- a/arch/tde-libs/tde-libkdcraw/PKGBUILD
+++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD
@@ -1,66 +1,49 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libkdcraw
-pkgver=14.0.10
+_mod=libkdcraw
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('tde-tdelibs' 'libraw' 'lcms2')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
-md5sums=('fedf15518c80f85174071df185a45c88')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5475e0b6c71879516579373a6c7bb523')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- ## Generate config files and update with autoreconf
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-
- msg "Copying system libtool files...."
- cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
- cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
-
- msg "Running autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf"
- aclocal
- autoupdate
- autoconf
- automake --add-missing
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
-
- ## configure
- msg "Configuring - ${pkgname}..."
-
- ./configure \
- --prefix=${TDEDIR} \
- --with-qt-dir=${QTDIR} \
- --with-qt-includes=${QTDIR}/include \
- --with-qt-libraries=${QTDIR}/lib \
- --localstatedir=/var \
- --enable-debug=full \
- --enable-closure
-
- ## make $NUMJOBS
- msg "Building - ${pkgname}..."
- make $NUMJOBS
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON
+
+ msg "Building $pkgname..."
+ ninja $NUMJOBS
}
package() {
- msg "Packaging - $pkgname-$pkgver"
-
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} # use for non-out-of-source
-
- make -j1 DESTDIR="$pkgdir" install
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD
index 68181afa8..15c4d66bd 100644
--- a/arch/tde-libs/tde-libkexiv2/PKGBUILD
+++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD
@@ -1,44 +1,48 @@
# Maintainer: Michael Manley <mmanley@nasutek.com>
# Contributor: David C. Rankin <drankinatty at gmail dot com>
-pkgname=tde-libkexiv2
-pkgver=14.0.10
+_mod=libkexiv2
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.12
pkgrel=1
pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
license=('GPL')
groups=('tde-libs')
depends=('tde-tdelibs' 'exiv2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
optdepends=()
-provides=("${pkgname#*-}")
-conflicts=("trinity-${pkgname#*-}")
-replaces=("trinity-${pkgname#*-}")
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
-md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('f86d32878031edb6e60796bfa047b8d5')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
- cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ${srcdir}/build
+ cd ${srcdir}/build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_GCC_VISIBILITY=ON
+ -DWITH_ALL_OPTIONS=ON
msg "Building $pkgname..."
- make $NUMJOBS
+ ninja $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -j1 install
}
diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD
index 91a64e928..92ddf2457 100644
--- a/arch/tde-meta/PKGBUILD
+++ b/arch/tde-meta/PKGBUILD
@@ -1,12 +1,14 @@
pkgname=tde-meta
-pkgver=14.0.10
-pkgrel=2
+pkgver=14.0.12
+pkgrel=1
pkgdesc="Trinity Desktop Environment"
arch=('any')
url="https://www.trinitydesktop.org/"
license=('GPL')
depends=(
# tde-base
+ 'tde-i18n'
+ 'tde-polkit-agent-tde'
'tde-tdeadmin'
'tde-tdeartwork'
'tde-tdebindings'
@@ -16,11 +18,14 @@ depends=(
# tde-core
'tde-arts'
'tde-avahi-tqt'
+ 'tde-cmake-trinity'
'tde-dbus-1-tqt'
'tde-dbus-tqt'
'tde-libart-lgpl'
+ 'tde-polkit-tqt'
'tde-tdebase'
'tde-tdelibs'
+ 'tde-tqca'
'tde-tqca-tls'
'tde-tqt3'
'tde-tqtinterface'
@@ -38,13 +43,17 @@ depends=(
# tde-extra
'tde-abakus'
+ 'tde-akode'
'tde-amarok'
'tde-basket'
'tde-gtk3-tqt-engine'
'tde-gtk-qt-engine'
+ 'tde-kile'
'tde-kmplayer'
+ 'tde-kmymoney'
'tde-krusader'
'tde-ksplash-engine-moodin'
+ 'tde-style-domino'
'tde-style-qtcurve'
'tde-systemsettings'
'tde-tdeaccessibility'
diff --git a/debian/_base/applications/development/ktechlab/debian/docs b/debian/_base/applications/development/ktechlab/debian/docs
index 724e08449..76c3076c9 100644
--- a/debian/_base/applications/development/ktechlab/debian/docs
+++ b/debian/_base/applications/development/ktechlab/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
TODO
diff --git a/debian/_base/applications/development/kxmleditor/debian/docs b/debian/_base/applications/development/kxmleditor/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/development/kxmleditor/debian/docs
+++ b/debian/_base/applications/development/kxmleditor/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/docs b/debian/_base/applications/internet/kftpgrabber/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/docs
+++ b/debian/_base/applications/internet/kftpgrabber/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/internet/kopete-otr/debian/docs b/debian/_base/applications/internet/kopete-otr/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/internet/kopete-otr/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/internet/tork/debian/docs b/debian/_base/applications/internet/tork/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/tork/debian/docs
+++ b/debian/_base/applications/internet/tork/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
-README
+README.md
TODO
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
debian/tmp/opt/trinity/bin/amarok
debian/tmp/opt/trinity/bin/amarokapp
debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index 00d0b4b9c..e0593e503 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
tdelibs14-trinity-dev, tdebase-trinity-dev,
- libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+ libakode-dev, libxine2-dev | libxine-dev,
libtag1-dev, libsqlite3-dev,
default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
libvisual-0.4-dev, libsdl1.2-dev,
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
-Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
Replaces: amarok-trinity (<< 4:14.0.0~)
Breaks: amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
Package: amarok-common-trinity
Architecture: all
Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
Replaces: amarok-engines-trinity (<< 4:14.0.0~)
Breaks: amarok-engines-trinity (<< 4:14.0.0~)
Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
for some reason over the other engines (e.g., it is the lightest engine
Dependency-wise).
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features
- (like visualizations) might not be available while using this engine.
-
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
diff --git a/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/debian/_base/applications/multimedia/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
index 03e35f4a6..8cc2b03b8 100644
--- a/debian/_base/applications/multimedia/k3b/debian/control
+++ b/debian/_base/applications/multimedia/k3b/debian/control
@@ -5,8 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends:
- cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
- tdelibs14-trinity-dev, libdbus-tqt-1-dev,
+ cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
libdvdread-dev, libasound2-dev, lame, libmp3lame-dev,
libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev,
libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev
diff --git a/debian/_base/applications/office/kile/debian/control b/debian/_base/applications/office/kile/debian/control
index 696646d5a..e6c22beb3 100644
--- a/debian/_base/applications/office/kile/debian/control
+++ b/debian/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/patches/series b/debian/_base/applications/office/kile/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/patches/series
+++ b/debian/_base/applications/office/kile/debian/patches/series
diff --git a/debian/_base/applications/office/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/debian/_base/applications/office/kile/debian/rules
+++ b/debian/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
#!/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_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-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/kile-trinity-i18n-br::
- -for language in `cd translations; ls -1d */`; do \
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+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"
+
+common-install-indep::
+ # Install translations into individual packages
+ -for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+ done
+ -for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
done
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
install/kile-trinity::
# Install pixmap
install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
- chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
clean::
rm -rf debian/kile-trinity-i18n-*
diff --git a/debian/_base/applications/office/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/debian/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/office/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
index 8074d6ba6..96d794392 100644
--- a/debian/_base/applications/office/kmymoney/debian/control
+++ b/debian/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
Standards-Version: 3.8.4
Package: kmymoney2-trinity
diff --git a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
opt/trinity/lib/lib*.la
opt/trinity/lib/lib*.so
diff --git a/debian/_base/applications/office/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules
index 0f794b445..ba37f1c35 100755
--- a/debian/_base/applications/office/kmymoney/debian/rules
+++ b/debian/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,18 @@
#!/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 --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-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
-
-clean::
- rm -f po/*.gmo
+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" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/debian/_base/applications/office/kmymoney/debian/watch b/debian/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/debian/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/README.source b/debian/_base/applications/settings/knetworkmanager8/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/changelog b/debian/_base/applications/settings/knetworkmanager8/debian/changelog
deleted file mode 100644
index 58dd721cb..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
- * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
- * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
- * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
- * Repaired poor usability for new wireless connections
- * Repaired poor usability for connection management
- * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
- * Repaired VPN plugins
- * VPNC now allows hashed group password
- * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
- * Patched backend for new NM0.8 API
- * Repaired poor usability in the "new connection" tasktray menu
- * Repaired poor usability in the available devices tasktray menu
- * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
- * Updated SVN snapshot (r941706).
- * debian/patches/04-dbus_access.patch
- - Most of the relevant changes have been merged upstream. The patch now
- only contains the Debian specific group "netdev" section.
- * debian/control
- - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org> Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
- * debian/patches/05-no_blank_psk.patch
- - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
- to validate them. Closes: #517213
- Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org> Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
- * Merge experimental branch into unstable. Remaining changes:
- - Remove 07-indicate_manual_config.patch, obsolete.
- * debian/control
- - Wrap Build-Depends.
- - Bump Build-Depends on debhelper to (>= 7).
- * debian/compat
- - Bump debhelper compat level to 7.
- * debian/rules
- - Include debhelper.mk before any other files as recommended by the cdbs
- documentation.
- * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org> Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
- * debian/patches/04-dbus_access.patch
- - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
- - Remove bare send_interface directives to avoid non-deterministic allow
- messages with no interface. Closes: #510757
- - Do not allow unpriviledged processes to ask for a users' connections.
- - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org> Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
- * Updated SVN snapshot (r908338).
- * debian/rules
- - Stop moving icons around, fixed upstream.
- * debian/patches/01-configure_package_name.patch
- - Make sure we set the correct PACKAGE name when generating the build
- system so the translations are installed properly.
- * debian/network-manager-kde.lintian-overrides
- - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org> Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
- * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
- * debian/control
- - Add Build-Depends on pkg-config.
- - Bump Build-Depends on nm-* packages to (>= 0.7.0).
- - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
- - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
- - Bump Depends on network-manager to (>= 0.7.0).
- - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
- new policy.
- * debian/rules
- - Install autostart desktop file into /usr/share/autostart/.
- - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
- Closes: #487303
- - Add support for both libtool 1.x and 2.x.
- * Switch patch management system to quilt.
- * debian/patches/04-dbus_access.patch
- - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
- * debian/patches/07-indicate_manual_config.patch
- - manual-means-online: If there are interfaces that are not managed by
- NetworkManager because they have custom configuration in
- /etc/network/interfaces, we assume to be online and show a wired network
- icon indicating manual network configuration.
- * debian/control
- - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org> Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
- * New upstream release.
- - Improved tray icon animation using mng files. Closes: #394815
- - Improved LEAP security. Closes: #470709
- * Removed patches
- - debian/patches/01-fix_french_translation.patch (merged upstream)
- - debian/patches/02-linux_types.patch (obsolete)
- - debian/patches/03-awk_path.patch (fixed upstream)
- - debian/patches/05-desktop_file_fixes.patch (merged upstream)
- * debian/knetworkmanager.linda
- - Remove the linda override file, linda is dead.
- * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
- - Rename the lintian override file so it is automatically installed by
- dh_lintian.
- * debian/rules
- - Drop the no longer required install rules for the override files.
- - Drop the install rule for the autostart file. It's provided by upstream
- now.
- * debian/copyright
- - Update the authors list.
- * debian/control
- - Bump Build-Depends on libnl-dev (>= 1.1).
- - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
- admin/ directory again.
- * debian/watch
- - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org> Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
- * debian/control
- - Use the new "Homepage:" field to specify the upstream URL.
- - The Vcs-* fields are now officially supported, so remove the XS- prefix.
- - Bump Standards-Version to 3.7.3. No further changes required.
- - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org> Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
- * Rebuild against network-manager 0.6.5 to enable phase2 and leap
- authentication support.
- * debian/rules
- - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
- built twice in a row. Closes: #442621
- * debian/control
- - Add Build-Conflicts: autoconf2.13. Closes: #441046
- * debian/menu
- - Set section to Applications/Network/Monitoring which seems to be the
- most appropriate amongst the available sections.
- * debian/patches/05-desktop_file_fixes.patch
- - Fix the *.desktop files to be compliant to the fd.o menu and desktop
- entry spec.
-
- -- Michael Biebl <biebl@debian.org> Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/patches/05-leap_support.patch
- - Removed, merged upstream.
- * debian/patches/06-version_check.patch
- - Removed, merged upstream.
- * The upstream tarball does not ship an admin/ directory. Build-Depend on
- kapptemplate, so we can copy it from there.
- * debian/menu
- - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org> Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
- * debian/patches/06-version_check.patch
- - Added. Fixes the problem with knetworkmanager no longer connecting
- automatically upon login. Closes: #431255
- If you are upgrading from a previous 0.2 svn snapshot, you may have to
- clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org> Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
- * debian/patches/02-linux_types.patch
- - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
- in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org> Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
- * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
- support. Closes: #415742
- * debian/control
- - Add XS-Vcs-* fields.
- - Add Recommends: network-manager-vpnc, network-manager-openvpn.
- * debian/rules
- - Compile with openvpn and vpnc support.
-
- * Removed patches that were merged upstream:
- - debian/patches/05-no_deserialize.patch
- - debian/patches/06-pretty_notification.patch
- - debian/patches/07-overlay_icon_vpn.patch
- - debian/patches/08-disable_sm.patch
- - debian/patches/09-dbus_bool_t.patch
-
- * debian/patches/02-linux_types.patch
- - Added. Needed to workaround a problem in libnl.
- * debian/patches/03-awk_path.patch
- - Added. In Debian awk is installed in /usr/bin.
- * debian/patches/04-dbus_access.patch
- - Do not remove the dbus at_console access check but make it an
- alternative to the Debian netdev group policy. Closes: #426467
- * debian/patches/05-leap_support.patch
- - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org> Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
- * Actually install the autostart file for knetworkmanager.
- Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org> Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
- * Pull some features and bug fixes from svn:
- - debian/patches/05-no_deserialize.patch
- + Don't call deserialize on encryption object to avoid warning of
- libnm-util. Closes: #391486
- - debian/patches/06-pretty_notification.patch
- + Prettify notification messages.
- - debian/patches/07-overlay_icon_vpn.patch
- + Show overlay icon (lock) for active VPN connections.
- - debian/patches/08-disable_sm.patch
- + Disable session management to avoid a deadlock when accessing tdewallet.
- Install an autostart file into /usr/share/autostart/ instead.
- Closes: #406162
- - debian/patches/09-dbus_bool_t.patch
- + Use dbus_bool_t instead of bool. Closes: #398974
- * debian/patches/01-fix_french_translation.patch
- - Added patch from Emmanuel Bouthenot which fixes some errors in the
- French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org> Tue, 9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
- * Update maintainer email address to biebl@debian.org.
-
- -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
- * Finally the 0.1 release. Woohoo!
- - Use an epoch to fix the versioning scheme I managed to mess up.
- - Fixes a crash when removing network objects for a nonexistent network
- interface. Closes: #390052
- * debian/patches/01-no_network_status.patch
- - Removed, fixed upstream.
- * debian/patches/03-configure.patch
- - Removed, fixed upstream.
- * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
- proper admin/ directory.
- * debian/patches/02-dialup.patch
- - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
- generate entries for /etc/network/interfaces yet.
-
- -- Michael Biebl <biebl@teco.edu> Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
- * Updated to svn revision 586773.
- * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
- page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu> Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
- * Updated to svn revision 577960.
- - Access TDEWallet on demand, not on startup. Closes: #379606
- * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu> Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
- * Updated to svn revision 560817.
- * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
- * Added 04-dbus_access.patch. Fixes D-Bus access rights.
- Closes: #379309, #379364
- * Enabled dial up support. Set pppconfig as configuration utility.
- Closes: #376071
- * Reload D-Bus after installation. Closes: #379307
- * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
- * Updated to svn revision 550737.
- * Added 01-no_network_status.patch which removes a build dependency on
- networkstatus.
- * Removed 03-configure_notifications.patch, merged upstream.
- * This version does not ship an admin/ directory. Added a build dependency
- on kapptemplate and modified debian/rules to copy it from kapptemplate.
- * Bumped Standards-Version to 3.7.2, no further changes required.
- * Updated homepage URL.
- * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
- gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
- their passwords.
-
- -- Michael Biebl <biebl@teco.edu> Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
- * New upstream release.
- * Removed 01-xdg_app.patch, merged upstream.
- * Added 03-configure_notifications.patch, this patch modifies the context
- menu of the systray applet to provide quick access to the notification
- settings.
- * Added a "Provides: knetworkmanager" to make the package installable by its
- upstream name.
- * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu> Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
- * Initial release.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 21:43:56 +0100
-
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/control b/debian/_base/applications/settings/knetworkmanager8/debian/control
deleted file mode 100644
index aa1275f5b..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/control
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs,
- debhelper (>= 9~),
- pkg-config,
- tdelibs14-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- network-manager-dev (<< 0.8.9),
- libhal-dev,
- libdbus-1-tqt-dev,
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
-Replaces: network-manager-kde-trinity (<< 4:14.0.0~)
-Breaks: network-manager-kde-trinity (<< 4:14.0.0~)
-Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: TDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by
- NetworkManager. It is mainly written for Trinity but also works for
- other desktop environments like GNOME or Xfce.
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/copyright b/debian/_base/applications/settings/knetworkmanager8/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri, 3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors:
- Timo Hoenig <thoenig@suse.de>
- Will Stephenson <wstephenson@suse.de>
- Stefan Bogner <sbogner@suse.de>
- Helmut Schaa <hschaa@suse.de>
- Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright:
- Copyright (C) 2005, 2006 Novell, Inc.
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1 b/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
deleted file mode 100644
index e4f5073db..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "Trinity Desktop Environment" "A NetworkManager front-end for TDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for TDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [TDE\-options]
-.SH DESCRIPTION
-A NetworkManager front-end for TDE
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/manpages b/debian/_base/applications/settings/knetworkmanager8/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/menu b/debian/_base/applications/settings/knetworkmanager8/debian/menu
deleted file mode 100644
index cc47df4d0..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde-trinity): \
- needs="X11" \
- section="Applications/Network/Monitoring" \
- title="KNetworkManager" \
- longtitle="A TDE frontend for NetworkManager" \
- command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index b5316fc73..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- # Ask D-Bus to reload the config file
- if [ -x "/etc/init.d/dbus" ]; then
- invoke-rc.d dbus force-reload || true
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/rules b/debian/_base/applications/settings/knetworkmanager8/debian/rules
deleted file mode 100755
index d38592f45..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-
-# Currently is not possible to build piklab with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
-include /usr/share/cdbs/1/rules/debhelper.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_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-binary-install/network-manager-kde-trinity::
- # Install autostart file
- install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
- debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
- mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/watch b/debian/_base/applications/settings/knetworkmanager8/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/debian/_base/applications/settings/knetworkmanager8/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/_base/applications/system/kpowersave/debian/changelog b/debian/_base/applications/system/kpowersave/debian/changelog
deleted file mode 100644
index 555de82cf..000000000
--- a/debian/_base/applications/system/kpowersave/debian/changelog
+++ /dev/null
@@ -1,372 +0,0 @@
-kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
- * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 Jul 2009 16:08:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
-
- * Moved Trinity to /opt/trinity
- * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 05 March 2009 29:52:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low
-
- * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 14 Dec 2008 15:12:00 -0600
-
-kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low
-
- * Merge from debian unstable, remaining changes:
- - debian/patches/kubuntu_02_messages_target.diff
- - Modified maintainer field per specification
-
- -- Harald Sitter <apachelogger@ubuntu.com> Fri, 25 Jan 2008 09:54:46 +0000
-
-kpowersave (0.7.3-2) unstable; urgency=low
-
- * debian/control
- - Bump Standards-Version to 3.7.3. No further changes required.
- - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support.
- Let the hal package depend on the correct suspend framework.
-
- -- Michael Biebl <biebl@debian.org> Fri, 25 Jan 2008 06:02:09 +0100
-
-kpowersave (0.7.3-1ubuntu1) hardy; urgency=low
-
- * Merge from debian unstable.
- * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class.
- * Remaining Ubuntu changes:
- - debian/patches/kubuntu_02_messages_target.diff
-
- -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Wed, 24 Oct 2007 20:41:44 +0200
-
-kpowersave (0.7.3-1) unstable; urgency=low
-
- * New upstream release.
- - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy ().
- Closes: #422057
- * debian/control
- - Use the new "Homepage:" field to specify the upstream URL.
- - Add a Build-Conflicts against autoconf2.13.
- * debian/menu
- - Update to the new menu spec.
- * debian/patches/10-kpowersave-crash-on-getenv.patch
- - Removed, fixed upstream.
- * debian/patches/06-handle_failed_suspend.patch
- - Removed, merged upstream.
- * debian/patches/05-restore_window.patch
- - Removed, merged upstream.
- * debian/patches/04-default_config.patch
- - Updated, wodim is now already in the application blacklist that is
- provided by upstream.
-
- -- Michael Biebl <biebl@debian.org> Thu, 04 Oct 2007 12:48:39 +0200
-
-kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low
-
- * Merge from debian unstable.
- * Remaining Ubuntu changes:
- * debian/control: change Maintainer field
- * debian/patches/kubuntu_01_kdepot.patch
- * debian/patches/kubuntu_02_messages_target.diff
-
- -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 19 May 2007 13:22:26 +1000
-
-kpowersave (0.7.2-3) unstable; urgency=low
-
- * debian/patches/10-kpowersave-crash-on-getenv.patch
- - Fixes a crash when the environment variable DESKTOP_SESSION is not set.
- Patch by Pierre Habouzit, thanks! Closes: #422420
-
- -- Michael Biebl <biebl@debian.org> Wed, 25 Apr 2007 21:07:05 +0200
-
-kpowersave (0.7.2-2) unstable; urgency=low
-
- * Upload to unstable.
- * debian/patches/05-restore_window.patch
- - Pull from svn. Properly restore minimized configuration dialog.
- Closes: #413638
- * debian/patches/06-handle_failed_suspend.patch
- - Pull from svn. Check the return code of the Suspend() method and display
- a message box if it failed. Closes: #413811
-
- -- Michael Biebl <biebl@debian.org> Wed, 25 Apr 2007 20:40:41 +0200
-
-kpowersave (0.7.2-1ubuntu1) feisty; urgency=low
-
- * Merge from debian experimental
- * Dropped Ubuntu changes:
- * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not
- conflict anymore
- * debian/rules: remove dh_iconcache - done by cdbs
- * Remaining Ubuntu changes:
- * debian/control: change Maintainer field
- * debian/patches/kubuntu_01_kdepot.patch
- * debian/patches/kubuntu_02_messages_target.diff
-
- -- Luka Renko <lure@ubuntu.com> Mon, 19 Mar 2007 22:30:13 +0100
-
-kpowersave (0.7.2-1) experimental; urgency=low
-
- * New upstream release. Closes: #412647
- * debian/patches/01-autoconf_2.6.patch,
- debian/patches/02-close_dialog_on_destroy.patch
- - Removed, merged upstream.
- * debian/patches/04-default_config.patch
- - Add wodim to application blacklist.
- - Do not unmount external media on suspend.
- kded/mediamanager in Debian is missing a patch which would allow that.
- * Beginning with this version, the dependency on powersaved as backend has
- been dropped. All the heavy lifting is done via HAL now.
- Update debian/control accordingly:
- - Remove build dependency on libpowersave-dev.
- - Remove dependency on powersaved, add a versioned dependency on
- hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support).
- - For proper suspend/resume support, hal should use one of the existing
- suspend frameworks. Add Recommends on these packages.
- - Update the package description.
-
- -- Michael Biebl <biebl@debian.org> Mon, 5 Mar 2007 07:24:09 +0100
-
-kpowersave (0.7.2-0ubuntu1) feisty; urgency=low
-
- * New upstream release: uses HAL directly (no powersave dependency)
- * Changes:
- * drop 01-autoconf_2.6.patch: included upstream
- * drop 02-close_dialog_on_destroy.patch: included upstream
- * drop 03-reset_blankonly_to_default.patch: fixed upstream
- * update kubuntu_01_kdepot.patch to apply
- * drop Build-Depends on libpowersave-dev: now uses HAL
- * drop Depends on powersaved: now uses HAL
- * update Maintainer field
- * UVF exception approved by MOTU https://launchpad.net/bugs/88793
-
- -- Luka Renko <lure@ubuntu.com> Wed, 28 Feb 2007 22:35:46 +0100
-
-kpowersave (0.6.2-5ubuntu1) feisty; urgency=low
-
- * Merge from debian unstable, remaining changes:
- - Added dh_iconcache
- - Add kubuntu_02_messages_target.diff fix messages
- target for .pot generation
- - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
- - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce
- its removal.
-
- -- ville palo <vi64pa@gmail.com> Sun, 21 Jan 2007 09:21:00 +0000
-
-kpowersave (0.6.2-5) unstable; urgency=low
-
- * Prepend a sequence number to all patches.
- * debian/patches/03-reset_blankonly_to_default.patch
- - Added. Reset tdescreensaver settings to correct default values on scheme
- changes and on application shutdown.
- Patch by Modestas Vainius, thanks! Closes: #399473
-
- -- Michael Biebl <biebl@debian.org> Sat, 20 Jan 2007 19:49:40 +0100
-
-kpowersave (0.6.2-4) unstable; urgency=low
-
- * debian/patches/close_dialog_on_destroy.patch
- - Added. Correctly close the information dialog when activated over dcop.
- Closes: #398201
-
- -- Michael Biebl <biebl@debian.org> Mon, 13 Nov 2006 06:05:56 +0100
-
-kpowersave (0.6.2-3) unstable; urgency=low
-
- * Update maintainer email address to biebl@debian.org.
-
- -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:04:12 +0200
-
-kpowersave (0.6.2-2ubuntu2) edgy; urgency=low
-
- * Rebuild against dbus 0.90
-
- -- Sebastian Dröge <slomo@ubuntu.com> Wed, 30 Aug 2006 22:04:58 +0200
-
-kpowersave (0.6.2-2ubuntu1) edgy; urgency=low
-
- * Merge from debian unstable.
-
- -- Luka Renko <lure@ubuntu.com> Sat, 12 Aug 2006 17:17:17 +0200
-
-kpowersave (0.6.2-2) unstable; urgency=medium
-
- * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824
-
- -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:10:10 +0200
-
-kpowersave (0.6.2-1) unstable; urgency=low
-
- * New upstream release.
- - Display correct warning message if user lacks permissions to connect to
- powersaved over dbus. Closes: #356609
- * Requires powersave 0.12.8 or newer.
-
- -- Michael Biebl <biebl@teco.edu> Sat, 24 Jun 2006 19:16:02 +0200
-
-kpowersave (0.6.1-1) unstable; urgency=low
-
- * New upstream release.
- * Corrected typo in package description. Closes: #364191
- * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream.
- * Bumped Standards-Version to 3.7.2, no further changes required.
-
- -- Michael Biebl <biebl@teco.edu> Mon, 15 May 2006 02:28:48 +0200
-
-kpowersave (0.6.0-1ubuntu4) dapper; urgency=low
-
- * Added dh_iconcache
-
- -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 13 May 2006 20:16:04 +1000
-
-kpowersave (0.6.0-1ubuntu3) dapper; urgency=low
-
- * Add kubuntu_02_messages_target.diff fix messages
- target for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:03:01 +0000
-
-kpowersave (0.6.0-1ubuntu2) dapper; urgency=low
-
- * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-
- -- Anthony Mercatante <tonio@ubuntu.com> Thu, 13 Apr 2006 00:40:57 +0200
-
-kpowersave (0.6.0-1ubuntu1) dapper; urgency=low
-
- * Added kpowersave-fix-utf8_in_eventrc.diff
-
- -- Luka Renko <lure.net@gmail.com> Wed, 12 Apr 2006 19:39:57 +0200
-
-kpowersave (0.6.0-1) unstable; urgency=low
-
- * New upstream release.
- * Requires powersave 0.12.7 or newer.
- * Added build dependency on libxtst-dev.
- * Added kpowersave-fix-utf8_in_eventrc.diff.
-
- -- Michael Biebl <biebl@teco.edu> Mon, 17 Apr 2006 18:21:14 +0200
-
-kpowersave (0.5.11-1ubuntu1) dapper; urgency=low
-
- * New upstream release.
-
- -- Luka Renko <lure.net@gmail.com> Sun, 26 Mar 2006 18:59:38 +0200
-
-kpowersave (0.5.11-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu> Thu, 23 Mar 2006 09:45:35 +0100
-
-kpowersave (0.5.10-1ubuntu1) dapper; urgency=low
-
- * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal.
-
- -- Michael Biebl <biebl@teco.edu> Thu, 9 Mar 2006 23:05:33 +0100
-
-kpowersave (0.5.10-1) unstable; urgency=low
-
- * New upstream release.
- * Requires powersave 0.12.2 or newer.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 7 Mar 2006 23:45:01 +0100
-
-kpowersave (0.5.9-1) unstable; urgency=low
-
- * New upstream release.
- * Requires powersave 0.12.1 or newer.
-
- -- Michael Biebl <biebl@teco.edu> Thu, 2 Mar 2006 18:43:24 +0100
-
-kpowersave (0.5.8-1) unstable; urgency=low
-
- * New upstream release.
- * Bumped debhelper compatibility to 5.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 21 Feb 2006 10:51:35 +0100
-
-kpowersave (0.5.7-1) unstable; urgency=low
-
- * New upstream release.
- - kpowersave now shows correct instructions how to start the powersaved
- daemon. Closes: #352218
- - Layout problem in the information dialog has been fixed. Closes: #352684
- * Corrected formatting of the homepage url in the long description.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 14 Feb 2006 23:27:37 +0100
-
-kpowersave (0.5.6-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 02:51:39 +0100
-
-kpowersave (0.5.5-1) unstable; urgency=low
-
- * New upstream release.
- * Removed build dependency on libcpufreq-dev as it is now correctly handled
- by libpowersave-dev.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 31 Jan 2006 01:32:36 +0100
-
-kpowersave (0.5.4-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu> Mon, 23 Jan 2006 23:14:39 +0100
-
-kpowersave (0.5.3-1) unstable; urgency=low
-
- * New upstream release.
- * Requires powersave 0.11.5 or newer.
-
- -- Michael Biebl <biebl@teco.edu> Wed, 18 Jan 2006 05:10:26 +0100
-
-kpowersave (0.5.2-1ubuntu1) dapper; urgency=low
-
- * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting
- automatically in GNOME (Closes: Malone #32340).
-
- -- Raphaël Pinson <raphink@ubuntu.com> Sat, 4 Mar 2006 17:22:09 +0100
-
-kpowersave (0.5.2-1) unstable; urgency=low
-
- * New upstream release.
- * Removed patches absolute_build_path_fix.diff and sound_files_path.diff,
- fixed upstream.
- * Tightened dependencies on powersave, version 0.11.2 or newer is required.
- * Use Debian libtool and regenerate the autotools files.
- + Added build dependencies to automake1.9, autoconf and libtool.
- * hal and dbus are now mandatory. Added the corresponding build
- dependencies.
- * Removed the build dependency on libqt3-compat-headers. Package has been
- fixed upstream to compile cleanly without it.
-
- -- Michael Biebl <biebl@teco.edu> Mon, 16 Jan 2006 02:02:45 +0100
-
-kpowersave (0.5.0-1) unstable; urgency=low
-
- * New upstream release.
- * This release was not uploaded to unstable.
-
- -- Michael Biebl <biebl@teco.edu> Tue, 10 Jan 2006 02:25:11 +0100
-
-kpowersave (0.4.5-2) unstable; urgency=low
-
- * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with
- powersaved (>= 0.10).
-
- -- Michael Biebl <biebl@teco.edu> Sun, 8 Jan 2006 18:00:08 +0100
-
-kpowersave (0.4.5-1) unstable; urgency=low
-
- * Initial release. Closes: #329922
-
- -- Michael Biebl <biebl@teco.edu> Wed, 9 Nov 2005 00:53:24 +0100
-
diff --git a/debian/_base/applications/system/kpowersave/debian/control b/debian/_base/applications/system/kpowersave/debian/control
deleted file mode 100644
index ce3379abb..000000000
--- a/debian/_base/applications/system/kpowersave/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: kpowersave-trinity
-Section: tde
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Replaces: kpowersave-trinity (<< 4:14.0.0~)
-Breaks: kpowersave-trinity (<< 4:14.0.0~)
-Description: HAL based power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
- management settings and policies of your computer.
- It relies on HAL to do the heavy lifting.
- .
- Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
- (warning) states
- * applet tooltip with information about battery fill and remaining battery
- time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a
- defined time)
- * a global configurable blacklist with programs which prevent autosuspend
- (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- KPowersave supports schemes with following configurable specific
- settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
diff --git a/debian/_base/applications/system/kpowersave/debian/copyright b/debian/_base/applications/system/kpowersave/debian/copyright
deleted file mode 100644
index a1557e62e..000000000
--- a/debian/_base/applications/system/kpowersave/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Sun, 25 Sep 2005 01:12:21 +0200.
-
-It was downloaded from http://sourceforge.net/projects/powersave/
-
-Copyright Holders:
- Danny Kukawka <dkukawka@suse.de>
- Thomas Renninger <trenn@suse.de>
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/_base/applications/system/kpowersave/debian/install b/debian/_base/applications/system/kpowersave/debian/install
deleted file mode 100644
index 7b00dd534..000000000
--- a/debian/_base/applications/system/kpowersave/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
deleted file mode 100644
index 35bdc35cd..000000000
--- a/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /opt/trinity/lib/libtdeinit_*.so
diff --git a/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
deleted file mode 100644
index 8f6135226..000000000
--- a/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm b/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-" c None",
-". c #6D2121",
-"+ c #783738",
-"@ c #743E40",
-"# c #5D2F30",
-"$ c #3E1618",
-"% c #8A0200",
-"& c #982306",
-"* c #A75C4B",
-"= c #D3B8BC",
-"- c #E9E0E1",
-"; c #E7E7ED",
-"> c #DDDFE7",
-", c #CCCBD7",
-"' c #B3ADBB",
-") c #827583",
-"! c #6A3227",
-"~ c #410B00",
-"{ c #080000",
-"] c #AE381A",
-"^ c #C79676",
-"/ c #D8C9B7",
-"( c #B3B7C2",
-"_ c #F2F8FF",
-": c #EBEDF4",
-"< c #D8D9E3",
-"[ c #CBCBD8",
-"} c #BEC0CF",
-"| c #B4B5C9",
-"1 c #A0A4BD",
-"2 c #9B90A1",
-"3 c #B08583",
-"4 c #8F493D",
-"5 c #340B02",
-"6 c #A71F09",
-"7 c #D5BEA2",
-"8 c #F1FFFF",
-"9 c #EEF2F6",
-"0 c #999AAD",
-"a c #C8C8D7",
-"b c #CFCFDB",
-"c c #C2C2D0",
-"d c #B6B6C6",
-"e c #A8A8BC",
-"f c #9B9BB1",
-"g c #8685A0",
-"h c #8D8EA6",
-"i c #AFB8CD",
-"j c #ABAFC6",
-"k c #9F534D",
-"l c #1C0000",
-"m c #B63F26",
-"n c #DAC1A4",
-"o c #DCD9DF",
-"p c #EEF3F6",
-"q c #B0B6C4",
-"r c #AEB0C4",
-"s c #BDBECF",
-"t c #B2B3C6",
-"u c #A6A7BB",
-"v c #9A9BB1",
-"w c #8C8EA5",
-"x c #797D94",
-"y c #98A0B4",
-"z c #B3BCD0",
-"A c #A99EAF",
-"B c #C46347",
-"C c #2B0C00",
-"D c #B63C1A",
-"E c #FED76A",
-"F c #E2BE8D",
-"G c #DCB4A6",
-"H c #D6BCBA",
-"I c #B3ABB9",
-"J c #A9A7B9",
-"K c #A4A5B7",
-"L c #9EA1B1",
-"M c #9798A9",
-"N c #9392A1",
-"O c #A2969F",
-"P c #C29994",
-"Q c #CD866F",
-"R c #DC6A3D",
-"S c #B42A0E",
-"T c #160101",
-"U c #B53817",
-"V c #FFDA34",
-"W c #FFF727",
-"X c #FCE43C",
-"Y c #F5B84C",
-"Z c #EDA45F",
-"` c #E79B6C",
-" . c #E39872",
-".. c #E2926F",
-"+. c #E08764",
-"@. c #E07853",
-"#. c #DF623C",
-"$. c #DA4925",
-"%. c #C83415",
-"&. c #B10E04",
-"*. c #900000",
-"=. c #180000",
-"-. c #B53918",
-";. c #FFD83B",
-">. c #FFF30F",
-",. c #FBED00",
-"'. c #F2BD00",
-"). c #EB8F02",
-"!. c #E4650D",
-"~. c #DE3B14",
-"{. c #D71E15",
-"]. c #CF180F",
-"^. c #C60D07",
-"/. c #BA0100",
-"(. c #B10000",
-"_. c #AA0000",
-":. c #AB0000",
-"<. c #980000",
-"[. c #170000",
-"}. c #FFF312",
-"|. c #FBEC00",
-"1. c #F2BA00",
-"2. c #EA8B00",
-"3. c #E45A00",
-"4. c #DE2200",
-"5. c #D40000",
-"6. c #CC0000",
-"7. c #C00000",
-"8. c #A20103",
-"9. c #8D0811",
-"0. c #7F1825",
-"a. c #6D293B",
-"b. c #474158",
-"c. c #60637E",
-"d. c #7D7D99",
-"e. c #9292AB",
-"f. c #77779C",
-"g. c #FDEE00",
-"h. c #F9BF00",
-"i. c #E68600",
-"j. c #CC5100",
-"k. c #AB260B",
-"l. c #95161A",
-"m. c #83232C",
-"n. c #803D48",
-"o. c #875E6B",
-"p. c #8D7C8A",
-"q. c #9698A7",
-"r. c #A5ABB8",
-"s. c #B7BCC6",
-"t. c #CBC7CD",
-"u. c #D0CBCF",
-"v. c #C7C4CC",
-"w. c #CAC9CF",
-"x. c #9F9FB8",
-"y. c #262641",
-"z. c #B63915",
-"A. c #FFD838",
-"B. c #FFF413",
-"C. c #F9EA00",
-"D. c #99822F",
-"E. c #8D7B67",
-"F. c #958B89",
-"G. c #A2A5A9",
-"H. c #B4BABD",
-"I. c #C6CDCE",
-"J. c #D2DADA",
-"K. c #D5DCE2",
-"L. c #CDD5DF",
-"M. c #BCC5D7",
-"N. c #A0B5D8",
-"O. c #83A5D9",
-"P. c #6B98DB",
-"Q. c #5A8FDE",
-"R. c #3C80E3",
-"S. c #5E8AD2",
-"T. c #B4B0BE",
-"U. c #3F3F61",
-"V. c #AA372A",
-"W. c #F9D742",
-"X. c #FFFC02",
-"Y. c #B1AB13",
-"Z. c #6F7184",
-"`. c #EDF1F8",
-" + c #EAECEF",
-".+ c #CBD4E0",
-"++ c #B2C6E0",
-"@+ c #97B7E0",
-"#+ c #84ADE2",
-"$+ c #79A8E5",
-"%+ c #6DA2E9",
-"&+ c #5E9CED",
-"*+ c #5299F8",
-"=+ c #509AFD",
-"-+ c #529BFE",
-";+ c #509CFF",
-">+ c #4094FF",
-",+ c #3D7EE0",
-"'+ c #B4B3C0",
-")+ c #5D5C7F",
-"!+ c #9D363D",
-"~+ c #D1D0B4",
-"{+ c #FFF856",
-"]+ c #A29E28",
-"^+ c #72727F",
-"/+ c #E5E2E1",
-"(+ c #94B7DB",
-"_+ c #97C2EF",
-":+ c #A3CBF7",
-"<+ c #A6CEFC",
-"[+ c #AAD0FF",
-"}+ c #ABD1FF",
-"|+ c #A1CAFF",
-"1+ c #94C4FF",
-"2+ c #8ABDFF",
-"3+ c #7EB6FF",
-"4+ c #6DACFF",
-"5+ c #559EFF",
-"6+ c #4195FF",
-"7+ c #2877EB",
-"8+ c #9DA6C2",
-"9+ c #767292",
-"0+ c #0E0E1C",
-"a+ c #9F3636",
-"b+ c #C7CED6",
-"c+ c #EBEDF5",
-"d+ c #BEBCAD",
-"e+ c #606061",
-"f+ c #D3CECE",
-"g+ c #9ABEE5",
-"h+ c #D5EBFF",
-"i+ c #EEF4FF",
-"j+ c #D2E5FF",
-"k+ c #BFDAFF",
-"l+ c #ACD0FF",
-"m+ c #9BC7FF",
-"n+ c #8FBFFF",
-"o+ c #7FB6FF",
-"p+ c #4F9BFF",
-"q+ c #2B84FD",
-"r+ c #1875F6",
-"s+ c #0E6AF1",
-"t+ c #075DE3",
-"u+ c #8498C5",
-"v+ c #8E89A3",
-"w+ c #161629",
-"x+ c #C8CFCE",
-"y+ c #E8EAEB",
-"z+ c #D1D1D7",
-"A+ c #5C5C5D",
-"B+ c #BBB7B7",
-"C+ c #A6C0DF",
-"D+ c #AAD1FD",
-"E+ c #DEECFF",
-"F+ c #C4DDFF",
-"G+ c #B4D4FF",
-"H+ c #A4CAFF",
-"I+ c #9AC5FF",
-"J+ c #76B1FF",
-"K+ c #2C89FF",
-"L+ c #016BFE",
-"M+ c #0064F8",
-"N+ c #005FEE",
-"O+ c #005AE5",
-"P+ c #0050DD",
-"Q+ c #6588C7",
-"R+ c #A09AB0",
-"S+ c #2A2A44",
-"T+ c #C9CFCF",
-"U+ c #E5E7E7",
-"V+ c #E0E0E0",
-"W+ c #676767",
-"X+ c #A3A1A1",
-"Y+ c #B8C4D9",
-"Z+ c #93BFF0",
-"`+ c #D6E9FF",
-" @ c #BDD9FF",
-".@ c #ACCFFF",
-"+@ c #A3CAFF",
-"@@ c #7BB5FF",
-"#@ c #2386FF",
-"$@ c #0472FF",
-"%@ c #006AFC",
-"&@ c #0065F4",
-"*@ c #005FEA",
-"=@ c #005AE3",
-"-@ c #004FDB",
-";@ c #4B78C9",
-">@ c #A5A0B1",
-",@ c #454569",
-"'@ c #E4E6E6",
-")@ c #E7E7E7",
-"!@ c #7D7D7E",
-"~@ c #898788",
-"{@ c #C7CAD5",
-"]@ c #89B6EA",
-"^@ c #C7E1FF",
-"/@ c #B6D5FF",
-"(@ c #ABCEFF",
-"_@ c #86BBFF",
-":@ c #2F8EFF",
-"<@ c #117BFF",
-"[@ c #0570FF",
-"}@ c #0068F8",
-"|@ c #0063F0",
-"1@ c #005DE7",
-"2@ c #0059DF",
-"3@ c #004CD6",
-"4@ c #3369CD",
-"5@ c #A3A2B4",
-"6@ c #585880",
-"7@ c #909090",
-"8@ c #717072",
-"9@ c #C6C4CB",
-"0@ c #84AFE7",
-"a@ c #B5D7FF",
-"b@ c #B5D4FF",
-"c@ c #96C4FF",
-"d@ c #3A96FF",
-"e@ c #1C82FF",
-"f@ c #0D77FF",
-"g@ c #006BFD",
-"h@ c #0066F4",
-"i@ c #0061EC",
-"j@ c #005BE4",
-"k@ c #0055DB",
-"l@ c #004ED3",
-"m@ c #0D51CB",
-"n@ c #9298B7",
-"o@ c #6B6A90",
-"p@ c #0B0B17",
-"q@ c #E5E6E6",
-"r@ c #E6E6E6",
-"s@ c #9F9F9F",
-"t@ c #636265",
-"u@ c #BFBABC",
-"v@ c #80AAE1",
-"w@ c #9FC9FF",
-"x@ c #A8CEFF",
-"y@ c #4EA1FF",
-"z@ c #2489FF",
-"A@ c #187EFF",
-"B@ c #0069FA",
-"C@ c #005EE8",
-"D@ c #0058DF",
-"E@ c #0052D7",
-"F@ c #004DCE",
-"G@ c #0047C8",
-"H@ c #7B8CBA",
-"I@ c #7E7B9B",
-"J@ c #1D1D34",
-"K@ c #E5E5E5",
-"L@ c #AAAAAB",
-"M@ c #5E5E60",
-"N@ c #B3ADAC",
-"O@ c #90ADDA",
-"P@ c #78B4FC",
-"Q@ c #61ADFF",
-"R@ c #2D90FF",
-"S@ c #2185FF",
-"T@ c #0E78FF",
-"U@ c #016CFE",
-"V@ c #0066F5",
-"W@ c #005CE4",
-"X@ c #0055DC",
-"Y@ c #0050D3",
-"Z@ c #004ACB",
-"`@ c #003AC2",
-" # c #617CC1",
-".# c #8C89A2",
-"+# c #2D2D4C",
-"@# c #E4E4E4",
-"## c #B5B5B5",
-"$# c #606062",
-"%# c #9D9A9B",
-"&# c #ABB6CF",
-"*# c #3D94F7",
-"=# c #3C9CFF",
-"-# c #2C8DFF",
-";# c #1A80FF",
-"># c #0772FF",
-",# c #0068FB",
-"'# c #0062F2",
-")# c #005BEA",
-"!# c #0053E2",
-"~# c #004FD9",
-"{# c #024BCF",
-"]# c #094DC7",
-"^# c #1950C0",
-"/# c #6681C0",
-"(# c #8987A0",
-"_# c #41416E",
-":# c #E3E3E3",
-"<# c #BCBCBC",
-"[# c #69696B",
-"}# c #858488",
-"|# c #BDBAC5",
-"1# c #3E8DEF",
-"2# c #3094FF",
-"3# c #1C84FF",
-"4# c #0473FF",
-"5# c #0069FD",
-"6# c #0364F2",
-"7# c #1464E5",
-"8# c #296AD7",
-"9# c #4A7ACB",
-"0# c #6281BF",
-"a# c #7B8CB9",
-"b# c #9098B4",
-"c# c #ABAAB7",
-"d# c #B4B2B9",
-"e# c #B8B7BD",
-"f# c #AAAAB9",
-"g# c #8080A3",
-"h# c #5B5B8F",
-"i# c #A03838",
-"j# c #E2E2E2",
-"k# c #727274",
-"l# c #727276",
-"m# c #BDB6BB",
-"n# c #508DE5",
-"o# c #1579F9",
-"p# c #347FE8",
-"q# c #5287D9",
-"r# c #6B8DCB",
-"s# c #8699C1",
-"t# c #9BA4BC",
-"u# c #BAB8C0",
-"v# c #CCC6C4",
-"w# c #D1CCC9",
-"x# c #D3D0CE",
-"y# c #D3D0D6",
-"z# c #D1D2E3",
-"A# c #D4D6EE",
-"B# c #DADBF6",
-"C# c #DCDEE9",
-"D# c #D4D4D4",
-"E# c #BFBFC4",
-"F# c #A6A6B9",
-"G# c #8686AD",
-"H# c #56568C",
-"I# c #3E3E79",
-"J# c #A13434",
-"K# c #CAD4D4",
-"L# c #7C7C7D",
-"M# c #67676A",
-"N# c #ACABB4",
-"O# c #AAB1CA",
-"P# c #AAB1C9",
-"Q# c #C5C2C7",
-"R# c #D3CCCA",
-"S# c #D7D1D0",
-"T# c #DAD7D8",
-"U# c #DEDCE0",
-"V# c #D8D9EA",
-"W# c #CCCFF1",
-"X# c #C5C8F6",
-"Y# c #C5C9FA",
-"Z# c #CACDFF",
-"`# c #D0D3FF",
-" $ c #D7DAFF",
-".$ c #E1E3FF",
-"+$ c #EAECFF",
-"@$ c #EDEEFD",
-"#$ c #E2E3E7",
-"$$ c #CBCBC7",
-"%$ c #C8C8C4",
-"&$ c #BDBDC0",
-"*$ c #9E9EAF",
-"=$ c #6A6A9D",
-"-$ c #840808",
-";$ c #C18B8B",
-">$ c #EBF3F3",
-",$ c #E8F0F0",
-"'$ c #BDC2C2",
-")$ c #878A8A",
-"!$ c #616367",
-"~$ c #B1B1B4",
-"{$ c #D0CECC",
-"]$ c #DEDBD8",
-"^$ c #E4E4E2",
-"/$ c #E6E6E5",
-"($ c #E7E8EA",
-"_$ c #D2D4F9",
-":$ c #B9BEFD",
-"<$ c #B0B5FF",
-"[$ c #B4B9FF",
-"}$ c #BFC3FF",
-"|$ c #C9CEFF",
-"1$ c #D5D8FF",
-"2$ c #DDDFFF",
-"3$ c #E4E7FC",
-"4$ c #E3E4EF",
-"5$ c #DADBDF",
-"6$ c #D1D1D2",
-"7$ c #C5C5C5",
-"8$ c #B1B1B1",
-"9$ c #959595",
-"0$ c #717170",
-"a$ c #606056",
-"b$ c #676782",
-"c$ c #17172F",
-"d$ c #5C0303",
-"e$ c #9E4545",
-"f$ c #C08787",
-"g$ c #B59F9F",
-"h$ c #8F8787",
-"i$ c #5D5C5F",
-"j$ c #777A7E",
-"k$ c #9DA0A4",
-"l$ c #B1B2B2",
-"m$ c #BCBBBB",
-"n$ c #C5C5C3",
-"o$ c #D3D3D3",
-"p$ c #E1E1E1",
-"q$ c #DDDDEA",
-"r$ c #D4D6F5",
-"s$ c #CED1FD",
-"t$ c #D4D6FD",
-"u$ c #DDDEF5",
-"v$ c #DBDCE7",
-"w$ c #D8D8DB",
-"x$ c #D0CFCF",
-"y$ c #C0C1BF",
-"z$ c #ACACAB",
-"A$ c #959594",
-"B$ c #82827F",
-"C$ c #737370",
-"D$ c #64646D",
-"E$ c #595973",
-"F$ c #565680",
-"G$ c #48487B",
-"H$ c #0D0D1B",
-"I$ c #2C0000",
-"J$ c #4B0E0E",
-"K$ c #541717",
-"L$ c #521516",
-"M$ c #430E10",
-"N$ c #442329",
-"O$ c #59535C",
-"P$ c #777882",
-"Q$ c #97979B",
-"R$ c #A7A7A8",
-"S$ c #AFAFAE",
-"T$ c #BABAB6",
-"U$ c #CBCAC6",
-"V$ c #D7D8D8",
-"W$ c #D9D9DB",
-"X$ c #D2D1CF",
-"Y$ c #C4C3C1",
-"Z$ c #B0AFAD",
-"`$ c #9B9B99",
-" % c #8B8B88",
-".% c #7E7E7D",
-"+% c #74747B",
-"@% c #66667E",
-"#% c #5A5A82",
-"$% c #44446F",
-"%% c #29294B",
-"&% c #131329",
-"*% c #06060E",
-"=% c #131319",
-"-% c #2C2C37",
-";% c #545463",
-">% c #757584",
-",% c #8D8D94",
-"'% c #989897",
-")% c #A1A19E",
-"!% c #A9A9A7",
-"~% c #A2A29F",
-"{% c #91918E",
-"]% c #848484",
-"^% c #7A7A85",
-"/% c #696983",
-"(% c #535376",
-"_% c #363659",
-":% c #1F1F3C",
-"<% c #0D0D1A",
-"[% c #12121C",
-"}% c #333345",
-"|% c #5A5A6F",
-"1% c #737385",
-"2% c #88888E",
-"3% c #7E7E89",
-"4% c #686882",
-"5% c #50506E",
-"6% c #30304C",
-"7% c #16162A",
-"8% c #080811",
-"9% c #1A1A29",
-"0% c #2E2E44",
-"a% c #26263C",
-"b% c #11111F",
-" ",
-" . + @ # $ ",
-" % & * = - ; > , ' ) ! ~ { ",
-" ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
-"6 7 8 9 0 a b c d e f g h i j k l ",
-"m n o p q r s t u v w x y z A B C ",
-"D E F G H I J K L M N O P Q R S T ",
-"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ",
-" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ",
-" [%}%|%1%2%3%4%5%6%7%8% ",
-" 9%0%a%b% ",
-" "};
diff --git a/debian/_base/applications/system/kpowersave/debian/menu b/debian/_base/applications/system/kpowersave/debian/menu
deleted file mode 100644
index c875d9194..000000000
--- a/debian/_base/applications/system/kpowersave/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(kpowersave-trinity):\
- needs="X11"\
- section="Applications/System/Monitoring"\
- title="KPowersave"\
- longtitle="Battery monitor and general power management"\
- icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
diff --git a/debian/_base/applications/system/kpowersave/debian/postinst b/debian/_base/applications/system/kpowersave/debian/postinst
deleted file mode 100644
index cf7c41189..000000000
--- a/debian/_base/applications/system/kpowersave/debian/postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kpowersave-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/system/kpowersave/debian/postrm b/debian/_base/applications/system/kpowersave/debian/postrm
deleted file mode 100644
index 99bd13d89..000000000
--- a/debian/_base/applications/system/kpowersave/debian/postrm
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
- print >&2 "Internal Error. Please report a bug."
- exit 1;
-fi
-
-case "$1" in
- remove)
- dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
- ;;
- purge)
- ;;
- upgrade)
- ;;
- *) echo "$0: didn't understand being called with \`$1'" 1>&2
- exit 0;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/system/kpowersave/debian/preinst b/debian/_base/applications/system/kpowersave/debian/preinst
deleted file mode 100644
index 3fe8514bd..000000000
--- a/debian/_base/applications/system/kpowersave/debian/preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
- print >&2 "Internal Error. Please report a bug."
- exit 1;
-fi
-
-case "$1" in
- install)
- divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
- divert=""
- fi
- dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
- ;;
- upgrade)
- divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
- fi
- ;;
- abort-upgrade)
- ;;
- *) echo "$0: didn't understand being called with \`$1'" 1>&2
- exit 0;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/changelog b/debian/_base/applications/system/polkit-agent-tde/debian/changelog
new file mode 100644
index 000000000..434ce69fc
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/changelog
@@ -0,0 +1,67 @@
+polkit-agent-tde (0.99.1-2) unstable; urgency=low
+
+ * Port to TDE and package renaming
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sun, 19 Dec 2021 18:12:00 +0900
+
+polkit-kde-1 (0.99.1-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Felix Geyer ]
+ * New upstream release.
+ - Drop fix_dialog_focus.diff, applied upstream.
+ - Remove non-functional checkbox "Remember password". (Closes: #691104)
+ * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop
+ on upgrade. (Closes: #645440)
+ * Bump Standards-Version to 3.9.4, no changes needed.
+
+ [ Pino Toscano ]
+ * The rebuild changes the tdebase-runtime dependency to kde-runtime.
+ (Closes: #716849)
+ * Update Vcs-* headers
+
+ -- Felix Geyer <fgeyer@debian.org> Mon, 12 Aug 2013 11:58:57 +0200
+
+polkit-kde-1 (0.99.0-3) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * Add debian/patches/fix_dialog_focus.diff from Kubuntu
+ - Prevents the auth dialog from popping up in the background where it can't
+ be seen
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Jun 2011 11:38:30 +0300
+
+polkit-kde-1 (0.99.0-2) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:28:45 +0300
+
+polkit-kde-1 (0.99.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Modestas Vainius ]
+ * Add Vcs fields to debian/control.
+ * Switch to dhmk based debian-qt-kde.mk.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump Standards-Version to 3.9.1, no changes needed.
+ * Bump libpolkit-qt-1-dev build depend to 0.99.0.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 23 Mar 2011 01:30:52 +0200
+
+polkit-kde-1 (0.95.1-2) unstable; urgency=low
+
+ * Update debian/control: add policykit-1 dependency.
+
+ -- Fathi Boudra <fabo@debian.org> Mon, 22 Mar 2010 09:08:17 +0100
+
+polkit-kde-1 (0.95.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #571531)
+
+ -- Fathi Boudra <fabo@debian.org> Thu, 25 Feb 2010 20:43:18 +0100
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/compat b/debian/_base/applications/system/polkit-agent-tde/debian/compat
index ec635144f..ec635144f 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/compat
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/compat
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/control b/debian/_base/applications/system/polkit-agent-tde/debian/control
new file mode 100644
index 000000000..645e7ec1e
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/control
@@ -0,0 +1,25 @@
+Source: polkit-agent-tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
+Standards-Version: 3.9.4
+Section: libs
+
+Package: polkit-agent-tde
+Architecture: any
+Provides: polkit-1-auth-agent
+Replaces: tde-ubuntu-integration
+Breaks: tde-ubuntu-integration
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
+Conflicts: tde-ubuntu-integration
+Description: TDE dialogs for PolicyKit
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+ bring up authentication dialogs used for obtaining privileges.
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/copyright b/debian/_base/applications/system/polkit-agent-tde/debian/copyright
new file mode 100644
index 000000000..a9cebd94f
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/copyright
@@ -0,0 +1,52 @@
+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/polkit-kde-1/0.99.1-1/
+
+Original polkit-kde-1 code was packaged for Debian by:
+
+ Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+ Jaroslav Reznik <jreznik@redhat.com>
+ Gökçen Eraslan <gokcen@pardus.org.tr>
+ Dario Freddi <drf@kde.org>
+ Daniel Nicoletti <dantti85-pk@yahoo.com.br>
+ Dirk Mueller <mueller@kde.org>
+
+Copyright:
+
+ Copyright (C) 2009 Jaroslav Reznik
+ Copyright (C) 2007-2008 Gökçen Eraslan
+ Copyright (C) 2008-2009 Dario Freddi
+ Copyright (C) 2008 Daniel Nicoletti
+ Copyright (C) 2008 Dirk Mueller
+
+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-2' and
+`/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/docs b/debian/_base/applications/system/polkit-agent-tde/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/_base/applications/system/kpowersave/debian/patches/series b/debian/_base/applications/system/polkit-agent-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/system/kpowersave/debian/patches/series
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/system/kpowersave/debian/rules b/debian/_base/applications/system/polkit-agent-tde/debian/rules
index 9bd279c93..a6797f19a 100755
--- a/ubuntu/_base/applications/system/kpowersave/debian/rules
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/rules
@@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -16,8 +14,4 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
- -DWITH_GCC_VISIBILITY="ON"
-
-install/kpowersave-trinity::
- install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
- install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/source/format b/debian/_base/applications/system/polkit-agent-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/source/format
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/source/format
diff --git a/debian/_base/applications/settings/knetworkmanager8/debian/source/options b/debian/_base/applications/system/polkit-agent-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/settings/knetworkmanager8/debian/source/options
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/source/options
diff --git a/debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog
new file mode 100644
index 000000000..39785e5c7
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low
+
+ * First TDE release
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/debian/_base/applications/system/kpowersave/debian/compat b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
index ec635144f..ec635144f 100644
--- a/debian/_base/applications/system/kpowersave/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/control b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
new file mode 100644
index 000000000..b5c61299d
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -0,0 +1,16 @@
+Source: tdeio-appinfo-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-appinfo-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: TDEIO slave for the appinfo protocol
+ Adds support for the "appinfo:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform appinfo: searches in TDE.
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright
new file mode 100644
index 000000000..f64b4fdd9
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 08 May 2022 20:11:00 +0900
+
+Copyright:
+ This program was initially written by Robert Hogan <robert@roberthogan.net>
+
+License:
+ You are free to distribute this software under the terms of
+ the GNU General Public License 2 or higher.
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules
new file mode 100755
index 000000000..16f2fa011
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/debian/_base/applications/system/kpowersave/debian/source/format b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/system/kpowersave/debian/source/format
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format
diff --git a/debian/_base/applications/system/kpowersave/debian/source/options b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/system/kpowersave/debian/source/options
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options
diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/docs b/debian/_base/applications/themes/tde-style-ia-ora/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/docs b/debian/_base/applications/themes/twin-style-crystal/debian/docs
index e845566c0..0b6e0f321 100644
--- a/debian/_base/applications/themes/twin-style-crystal/debian/docs
+++ b/debian/_base/applications/themes/twin-style-crystal/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/docs b/debian/_base/applications/utilities/qalculate-tde/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/common/cmake/debian/control b/debian/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/debian/_base/common/cmake/debian/control
+++ b/debian/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
Standards-Version: 3.8.4
Package: cmake-trinity
diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control
index 07d221106..eedaebd3a 100644
--- a/debian/_base/core/tdebase/debian/control
+++ b/debian/_base/core/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, 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
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev
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
@@ -14,7 +14,7 @@ Section: tde
Architecture: all
Replaces: kdebase-trinity (<< 4:14.0.0~)
Breaks: kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${source:Version})
Description: base components from the official TDE release
@@ -474,7 +474,7 @@ Replaces: ksmserver-trinity (<< 4:14.0.0~)
Breaks: ksmserver-trinity (<< 4:14.0.0~)
Provides: x-session-manager
Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${source:Version}) | x-window-manager
-Recommends: kpersonalizer-trinity (= ${source:Version})
+Recommends: kpersonalizer-trinity (= ${source:Version}), polkit-agent-tde
Description: session manager for TDE
This package contains the TDE session manager. It is responsible for
restoring your TDE session on login. It is also needed to properly
diff --git a/debian/_base/core/tdebase/debian/kappfinder-trinity.install b/debian/_base/core/tdebase/debian/kappfinder-trinity.install
index d99c8f055..eac5c8e50 100644
--- a/debian/_base/core/tdebase/debian/kappfinder-trinity.install
+++ b/debian/_base/core/tdebase/debian/kappfinder-trinity.install
@@ -211,6 +211,7 @@ debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.
debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kappfinder.png
+debian/tmp/opt/trinity/share/man/man1/kappfinder.1
debian/icons/kappfinder.xpm /opt/trinity/share/pixmaps
debian/icons/kappfinder-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages b/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages
deleted file mode 100644
index b83ec9565..000000000
--- a/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kappfinder-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kate-trinity.install b/debian/_base/core/tdebase/debian/kate-trinity.install
index 93c4a1b87..4ab5fb474 100644
--- a/debian/_base/core/tdebase/debian/kate-trinity.install
+++ b/debian/_base/core/tdebase/debian/kate-trinity.install
@@ -60,6 +60,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kate.png
debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kwrite.png
debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kate2.svgz
debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/opt/trinity/share/man/man1/kate.1
+debian/tmp/opt/trinity/share/man/man1/kwrite.1
debian/tmp/opt/trinity/share/servicetypes/kateplugin.desktop
debian/icons/kate-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kate-trinity.manpages b/debian/_base/core/tdebase/debian/kate-trinity.manpages
deleted file mode 100644
index 56b772103..000000000
--- a/debian/_base/core/tdebase/debian/kate-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kate-trinity.1
-debian/man/kwrite-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kfind-trinity.install b/debian/_base/core/tdebase/debian/kfind-trinity.install
index 3c02d8aae..b17c5eebb 100644
--- a/debian/_base/core/tdebase/debian/kfind-trinity.install
+++ b/debian/_base/core/tdebase/debian/kfind-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.docbook
debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kfind.png
+debian/tmp/opt/trinity/share/man/man1/kfind.1
debian/tmp/opt/trinity/share/services/kfindpart.desktop
debian/tmp/opt/trinity/share/servicetypes/findpart.desktop
diff --git a/debian/_base/core/tdebase/debian/kfind-trinity.manpages b/debian/_base/core/tdebase/debian/kfind-trinity.manpages
deleted file mode 100644
index f0e6d9c78..000000000
--- a/debian/_base/core/tdebase/debian/kfind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfind-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kicker-trinity.install b/debian/_base/core/tdebase/debian/kicker-trinity.install
index 839bdc565..c9cd96420 100644
--- a/debian/_base/core/tdebase/debian/kicker-trinity.install
+++ b/debian/_base/core/tdebase/debian/kicker-trinity.install
@@ -259,6 +259,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/systemtray.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/taskbar.png
debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+debian/tmp/opt/trinity/share/man/man1/appletproxy.1
+debian/tmp/opt/trinity/share/man/man1/extensionproxy.1
+debian/tmp/opt/trinity/share/man/man1/kasbar.1
+debian/tmp/opt/trinity/share/man/man1/kicker.1
debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/suspend2disk.png
diff --git a/debian/_base/core/tdebase/debian/kicker-trinity.manpages b/debian/_base/core/tdebase/debian/kicker-trinity.manpages
deleted file mode 100644
index 399a3843c..000000000
--- a/debian/_base/core/tdebase/debian/kicker-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/appletproxy-trinity.1
-debian/man/extensionproxy-trinity.1
-debian/man/kasbar-trinity.1
-debian/man/kicker-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.install b/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
index ec5672f01..039265b1b 100644
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
+++ b/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
@@ -30,6 +30,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/new.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selecticon.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/opt/trinity/share/man/man1/kmenuedit.1
debian/icons/kmenuedit.xpm /opt/trinity/share/pixmaps
debian/icons/kmenuedit-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages b/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages
deleted file mode 100644
index e657bdffb..000000000
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmenuedit-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.install b/debian/_base/core/tdebase/debian/konqueror-trinity.install
index d073e179d..bda8841eb 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.install
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.install
@@ -192,6 +192,9 @@ debian/tmp/opt/trinity/share/services/konq_sidebartng.desktop
debian/tmp/opt/trinity/share/services/konq_textview.desktop
debian/tmp/opt/trinity/share/services/konq_treeview.desktop
debian/tmp/opt/trinity/share/servicetypes/konqaboutpage.desktop
+debian/tmp/opt/trinity/share/man/man1/keditbookmarks.1
+debian/tmp/opt/trinity/share/man/man1/kfmclient.1
+debian/tmp/opt/trinity/share/man/man1/konqueror.1
debian/icons/keditbookmarks.xpm /opt/trinity/share/pixmaps
debian/icons/keditbookmarks-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.manpages b/debian/_base/core/tdebase/debian/konqueror-trinity.manpages
deleted file mode 100644
index 8097ed067..000000000
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/konqueror-trinity.1
-debian/man/kfmclient-trinity.1
-debian/man/keditbookmarks-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.postinst b/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
index 4c62f6bf2..a68978a50 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
@@ -26,7 +26,7 @@ case "$1" in
divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
- --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
+ --slave /usr/share/man/man1/x-www-browser.1 x-www-browser.1 /opt/trinity/share/man/man1/konqueror.1
;;
install)
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.install b/debian/_base/core/tdebase/debian/konsole-trinity.install
index ee966a5c1..b7fd05d0c 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.install
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.install
@@ -82,6 +82,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/konsole.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/tabbar.png
debian/tmp/opt/trinity/share/icons/hicolor/*/apps/konsole.png
debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/konsole.svgz
+debian/tmp/opt/trinity/share/man/man1/konsole.1
debian/tmp/opt/trinity/share/mimelnk/application/x-konsole.desktop
debian/tmp/opt/trinity/share/services/kded/kwrited.desktop
debian/tmp/opt/trinity/share/services/konsolepart.desktop
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.manpages b/debian/_base/core/tdebase/debian/konsole-trinity.manpages
deleted file mode 100644
index 8c33f637e..000000000
--- a/debian/_base/core/tdebase/debian/konsole-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/konsole-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.postinst b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
index d8be0590f..532e028bd 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
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.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
+ --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
diff --git a/debian/_base/core/tdebase/debian/kpager-trinity.install b/debian/_base/core/tdebase/debian/kpager-trinity.install
index 8e7ee184a..17d32c189 100644
--- a/debian/_base/core/tdebase/debian/kpager-trinity.install
+++ b/debian/_base/core/tdebase/debian/kpager-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/screenshot.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/settings.png
debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kpager.png
+debian/tmp/opt/trinity/share/man/man1/kpager.1
debian/icons/kpager.xpm /opt/trinity/share/pixmaps
debian/icons/kpager-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kpager-trinity.manpages b/debian/_base/core/tdebase/debian/kpager-trinity.manpages
deleted file mode 100644
index b34d67959..000000000
--- a/debian/_base/core/tdebase/debian/kpager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpager-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
index 1b0039191..749090dab 100644
--- a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
+++ b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step3.png
debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step4.png
debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step5.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/kpersonalizer.png
+debian/tmp/opt/trinity/share/man/man1/kpersonalizer.1
debian/icons/kpersonalizer.xpm /opt/trinity/share/pixmaps
debian/icons/kpersonalizer-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
deleted file mode 100644
index bcd309b73..000000000
--- a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpersonalizer-trinity.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.install b/debian/_base/core/tdebase/debian/ksmserver-trinity.install
index fbbd61ab4..de0b2623f 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.install
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.install
@@ -7,3 +7,4 @@ debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdown.png
debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
+debian/tmp/opt/trinity/share/man/man1/starttde.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages b/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages
deleted file mode 100644
index 354e23800..000000000
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/starttde-trinity.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 7983daa09..14e203a41 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
x-session-manager /opt/trinity/bin/starttde 40 \
- --slave /usr/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
+ --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
diff --git a/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1 b/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1
deleted file mode 100644
index 3ab13208f..000000000
--- a/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
-.SH NAME
-appletproxy
-\- TDE kicker panel applet proxy
-.SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The applet's desktop file
-.SS
-.SS Options:
-.TP
-.B \-\-configfile <file>
-The config file to be used
-.TP
-.B \-\-callbackid <id>
-DCOP callback id of the applet container
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/applets\fP
-kicker applets directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBextensionproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1 b/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1
deleted file mode 100644
index 987164834..000000000
--- a/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
-.SH NAME
-drkonqi
-\- TDE crash handler gives the user feedback if a program crashed
-.SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-The TDE crash handler gives the user feedback if a program crashed.
-.SH OPTIONS
-.SS Options:
-.TP
-.B \-\-signal <number>
-The signal number that was caught
-.TP
-.B \-\-appname <name>
-Name of the program
-.TP
-.B \-\-apppath <path>
-Path to the executable
-.TP
-.B \-\-appversion <version>
-The version of the program
-.TP
-.B \-\-bugaddress <address>
-The bug address to use
-.TP
-.B \-\-programname <name>
-Translated name of the program
-.TP
-.B \-\-pid <pid>
-The PID of the program
-.TP
-.B \-\-startupid <id>
-Startup ID of the program
-.TP
-.B \-\-tdeinit
-The program was started by tdeinit
-.TP
-.B \-\-safer
-Disable arbitrary disk access
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-
-.SH AUTHORS
-.nf
-Hans Petter Bieker <bieker@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1 b/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1
deleted file mode 100644
index 4ea041189..000000000
--- a/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
-.SH NAME
-extensionproxy
-\- TDE kicker panel extension proxy
-.SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The extension's desktop file
-.SS
-.SS Options:
-.TP
-.B \-\-configfile <file>
-The config file to be used
-.TP
-.B \-\-callbackid <id>
-DCOP callback id of the extension container
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/extensions\fP
-kicker extensions directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBappletproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1 b/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1
deleted file mode 100644
index d98e166c2..000000000
--- a/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
-.SH NAME
-gentdmconf
-\- generate configuration files for tdm
-.SH SYNOPSIS
-\fBgentdmconf\fP
-.RB [ \-\-in
-.IR /path/to/new/tdm\-config\-dir ]
-.RS 11
-.RB [ \-\-old\-xdm
-.IR /path/to/old/xdm\-dir ]
-.br
-.RB [ \-\-old\-kde
-.IR /path/to/old/kde\-config\-dir ]
-.br
-.RB [ \-\-no\-old ]
-.RB [ \-\-no\-old\-xdm ]
-.RB [ \-\-no\-old\-kde ]
-.RB [ \-\-old\-scripts ]
-.br
-.RB [ \-\-no\-old\-scripts ]
-.RB [ \-\-old\-confs ]
-.RB [ \-\-no\-backup ]
-.br
-.RB [ \-\-no\-in\-notice ]
-.RE
-
-.SH DESCRIPTION
-\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
-.br
-If an older xdm/tdm configuration is found, its config files are "absorbed";
-if it lives in the new target directory, its scripts are reused (and possibly
-modified) as well, otherwise the scripts are ignored and default scripts are
-installed.
-.SH OPTIONS
-.TP
-.BI \-\-in \ /path/to/new/tdm\-config\-dir
-In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
-.br
-Default is \fI/etc/trinity/tdm\fP.
-.TP
-.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
-Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
-.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
-there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
-.br
-Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
-.TP
-.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
-Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
-.br
-.RI Default\ is\ to\ scan\ /etc/trinity \ and\ { /usr,/usr/local ,
-.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
-.TP
-.B \-\-no\-old
-Don't look at older xdm/tdm configurations, just create default config.
-.TP
-.B \-\-no\-old\-xdm
-Don't look at older xdm configurations.
-.TP
-.B \-\-no\-old\-kde
-Don't look at older tdm configurations.
-.TP
-.B \-\-old\-scripts
-Directly use all scripts from the older xdm/tdm configuration.
-.TP
-.B \-\-no\-old\-scripts
-Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
-.TP
-.B \-\-old\-confs
-Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
-.TP
-.B \-\-no\-backup
-Overwrite/delete old config files instead of backing them up.
-.TP
-.B \-\-no\-in\-notice
-Don't put the notice about \fB\-\-in\fP being used into the generated README.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1 b/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1
deleted file mode 100644
index ec8eae964..000000000
--- a/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KAPPFINDER 1 "August, 24 2003"
-.SH NAME
-kappfinder \- searches for program to add to the Kde menu
-.SH SYNOPSIS
-.B kappfinder
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kappfinder
-command.
-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.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
-.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 \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kappfinder was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kasbar-trinity.1 b/debian/_base/core/tdebase/debian/man/kasbar-trinity.1
deleted file mode 100644
index 7d57958d2..000000000
--- a/debian/_base/core/tdebase/debian/man/kasbar-trinity.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
-.SH NAME
-kasbar
-\- An alternative task manager
-.SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
-.SH OPTIONS
-.SS Options:
-.TP
-.B \-\-test
-Test the basic kasbar code
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-
-.SH SEE ALSO
-\fBkicker\fP(1)
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kate-trinity.1 b/debian/_base/core/tdebase/debian/man/kate-trinity.1
deleted file mode 100644
index e48268d6f..000000000
--- a/debian/_base/core/tdebase/debian/man/kate-trinity.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH KATE 1 "May 2006"
-.SH NAME
-kate \- TDE Advanced Text Editor
-.SH SYNOPSIS
-.B kate
-.RI [ options ] [file(s)]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kate
-command.
-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.
-\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
-
-It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
-
-Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
-
-It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
-
-.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 \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-s, \-\-start <name>
-Start Kate with a given session
-.TP
-.B \-u, \-\-use
-Use a already running kate instance (if possible)
-.TP
-.B \-p, \-\-pid <pid>
-Only try to reuse kate instance with this pid
-.TP
-.B \-e, \-\-encoding <name>
-Set encoding for the file to open
-.TP
-.B \-l, \-\-line <line>
-Navigate to this line
-.TP
-.B \-c, \-\-column <column>
-Navigate to this column
-.TP
-.B \-i, \-\-stdin
-Read the contents of stdin
-.TP
-.B file(s)
-is the file or the files to open
-
-.SH SEE ALSO
-.BR kwrite (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
-.PP
-kate was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1 b/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
deleted file mode 100644
index 46b2d4e1a..000000000
--- a/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-kblankscrn.kss
-\- TDE screensaver which shows a blank screen
-.SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-\fBKBlankScreen\fP is a screensaver which shows a blank screen.
-.SH OPTIONS
-.SS Options:
-.TP
-.B \-\-setup
-Setup screen saver
-.TP
-.B \-\-window\-id wid
-Run in the specified XWindow
-.TP
-.B \-\-root
-Run in the root XWindow
-.TP
-.B \-\-demo
-Start screen saver in demo mode [default]
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-valu