diff options
Diffstat (limited to 'ubuntu/_base/core/tdebase/debian')
34 files changed, 70 insertions, 119 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/ubuntu/_base/core/tdebase/debian/compat b/ubuntu/_base/core/tdebase/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdebase/debian/compat +++ b/ubuntu/_base/core/tdebase/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control index df3705481..0d88bcb73 100644 --- a/ubuntu/_base/core/tdebase/debian/control +++ b/ubuntu/_base/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 @@ -324,6 +324,7 @@ Architecture: any Replaces: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~) Breaks: kicker-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~) +Recommends: desktop-file-utils Suggests: khelpcenter-trinity, kicker-applets-trinity, menu Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~) Description: desktop panel for TDE diff --git a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 0b3eb0b52..000000000 --- a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kdesktop-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install index 96fce70e1..4e883cb6b 100644 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install @@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/man9.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/mann.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/support.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/quickstart.desktop +debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/releasenotes.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/visualdict.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/userguide.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/welcome.desktop @@ -99,6 +100,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian index 3a278bff7..c57f28095 100644 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1 @@ khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index b6b0656b7..000000000 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for khelpcenter-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian index bee8b8020..c46e478c8 100644 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1 @@ klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so -klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so -klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index b2c57de01..000000000 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for klipper-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian index c36dd0445..f9d56b353 100644 --- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,2 @@ kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so -kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so -kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index b3a79cc14..000000000 --- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kmenuedit-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian index 7006dfe10..f0a12e1aa 100644 --- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1 @@ konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so -konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so -konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst index 532e028bd..3b7be1e92 100644 --- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst +++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst @@ -21,9 +21,6 @@ case "$1" in configure) update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \ --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1 - - # force ldconfig due to tdeinit library - ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian index 2c7c61596..74b77ecf6 100644 --- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1 @@ ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so -ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst index 14e203a41..3b85196bb 100644 --- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst +++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst @@ -23,9 +23,6 @@ case "$1" in x-session-manager /opt/trinity/bin/starttde 40 \ --slave /usr/share/man/man1/x-session-manager.1 \ x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1" - - # force ldconfig due to tdeinit library - ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 598cd7092..99db98c6f 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -288,17 +288,17 @@ +@@ -396,17 +396,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff index 79aebbd1d..bb1dccd7b 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff @@ -2,7 +2,7 @@ diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop index dd64b58..0af3e44 100644 --- a/kate/data/kwrite.desktop +++ b/kate/data/kwrite.desktop -@@ -109,3 +109,4 @@ Terminal=false +@@ -12,3 +12,4 @@ Terminal=false X-TDE-InitialPreference=8 X-DCOP-ServiceType=Multi Categories=Qt;TDE;TextEditor; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff index 608802a75..64adee330 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff @@ -2,7 +2,7 @@ diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop index 6003b68..f33e1f4 100644 --- a/knetattach/knetattach.desktop +++ b/knetattach/knetattach.desktop -@@ -80,3 +80,4 @@ Terminal=false +@@ -11,3 +11,4 @@ Terminal=false X-TDE-StartupNotify=true Categories=Qt;TDE;Network; X-DocPath=knetattach/index.html diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff index 0bbb613a9..e5b89e2ba 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/kpersonalizer/kpersonalizer.desktop-orig 2005-03-17 01:05:16.091600616 +0000 +++ tdebase/kpersonalizer/kpersonalizer.desktop 2005-03-17 01:05:23.678447240 +0000 -@@ -77,3 +77,4 @@ +@@ -13,3 +13,4 @@ X-DCOP-ServiceType=Multi Categories=Qt;TDE;Settings; OnlyShowIn=TDE; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff index e12245486..ef79cc8eb 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff @@ -2,7 +2,7 @@ Index: b/konqueror/konquerorsu.desktop =================================================================== --- a/konqueror/konquerorsu.desktop +++ b/konqueror/konquerorsu.desktop -@@ -88,3 +88,4 @@ +@@ -11,3 +11,4 @@ Categories=Qt;TDE;X-TDE-System-su; OnlyShowIn=TDE; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff index 009d6f9db..e8f88b7f4 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff @@ -2,7 +2,7 @@ diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefon index 5d5e2b8..c989adf 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop -@@ -99,3 +99,4 @@ Terminal=false +@@ -10,3 +10,4 @@ Terminal=false X-TDE-InitialPreference=1 Categories=Qt;TDE;Graphics; X-DocPath=tdefontview/index.html diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff index 3eab104cb..e1d2567bd 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/kpager/kpager.desktop +++ tdebase/kpager/kpager.desktop -@@ -96,3 +96,4 @@ +@@ -11,3 +11,4 @@ X-TDE-StartupNotify=false X-DCOP-ServiceType=Unique Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff index a46ab143c..bfac9d8ea 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop +++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop -@@ -90,3 +90,4 @@ +@@ -9,3 +9,4 @@ Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index baeb8bfd5..fa2b265e5 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -11,7 +11,7 @@ TQHBoxLayout* hbuttonbox; --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp -@@ -697,7 +697,7 @@ +@@ -725,7 +725,7 @@ 2 * KDialog::spacingHint() ); // default factor @@ -20,3 +20,14 @@ // slighty more space for the new logout int factor = 2; +--- a/kcontrol/smserver/kcmsmserver.cpp ++++ b/kcontrol/smserver/kcmsmserver.cpp +@@ -94,7 +94,7 @@ + + c->setGroup("Logout"); + dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); +- dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false)); ++ dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", true)); + dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); + dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); + dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()), diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff index 8db1221a5..98fae0e38 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff @@ -1,6 +1,6 @@ --- tdebase-3.5.7/kfind/Kfind.desktop +++ tdebase-3.5.7/kfind/Kfind.desktop -@@ -73,3 +73,4 @@ +@@ -9,3 +9,4 @@ X-TDE-StartupNotify=true OnlyShowIn=TDE; Categories=Qt;TDE;Core; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index c312b6fb7..49a653275 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,6 +1,6 @@ --- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 +++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 -@@ -996,9 +996,14 @@ ReapChildren( void ) +@@ -1023,9 +1023,14 @@ ReapChildren( void ) /* don't kill again */ break; case running: diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index df3327542..8cdb710e0 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -45,6 +45,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_SFTP="ON" \ -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="ON" \ -DWITH_OPENEXR="ON" \ @@ -74,6 +75,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg +DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade +DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade + DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install index ffd4cc04a..0ab9bc8a8 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -88,20 +88,26 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install index c8666a793..132395ebd 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install @@ -1,6 +1,8 @@ debian/tmp/opt/trinity/bin/migratekde3 debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/tde_release_notes +debian/tmp/opt/trinity/bin/tde_license_info +debian/tmp/opt/trinity/bin/tde_show_license_info debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdeinit_displayconfig @@ -75,7 +77,9 @@ debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys +debian/tmp/opt/trinity/share/apps/kxkb/eventsrc debian/tmp/opt/trinity/share/autostart/tde_release_notes.desktop +debian/tmp/opt/trinity/share/autostart/tde_license_info.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook @@ -115,5 +119,4 @@ debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1 debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1 debian/tmp/opt/trinity/share/man/man1/kxkb.1 debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1 -debian/tmp/opt/trinity/share/man/man1/tdeio_system_documenthelper.1 debian/tmp/opt/trinity/share/man/man1/tdesu.1 diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian index 6501cf36b..ddaa5b274 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian @@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so -tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so -tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian index 52cd10d88..8410a13ae 100644 --- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,2 @@ tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so -tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so -tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index c812a9390..000000000 --- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for tdeprint-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm index 23de3a247..d51bcd8dc 100644 --- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm +++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm @@ -172,4 +172,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi fi +#DEBHELPER# + exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install index 381a173be..52c59c4a7 100644 --- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install @@ -11,24 +11,24 @@ debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so -debian/tmp/opt/trinity/lib/trinity/twin3_b2.la -debian/tmp/opt/trinity/lib/trinity/twin3_b2.so -debian/tmp/opt/trinity/lib/trinity/twin3_default.la -debian/tmp/opt/trinity/lib/trinity/twin3_default.so -debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la -debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so -debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la -debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so -debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la -debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so -debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la -debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so -debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la -debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so -debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la -debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so -debian/tmp/opt/trinity/lib/trinity/twin3_web.la -debian/tmp/opt/trinity/lib/trinity/twin3_web.so +debian/tmp/opt/trinity/lib/trinity/twin_b2.la +debian/tmp/opt/trinity/lib/trinity/twin_b2.so +debian/tmp/opt/trinity/lib/trinity/twin_default.la +debian/tmp/opt/trinity/lib/trinity/twin_default.so +debian/tmp/opt/trinity/lib/trinity/twin_keramik.la +debian/tmp/opt/trinity/lib/trinity/twin_keramik.so +debian/tmp/opt/trinity/lib/trinity/twin_laptop.la +debian/tmp/opt/trinity/lib/trinity/twin_laptop.so +debian/tmp/opt/trinity/lib/trinity/twin_modernsys.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys.so +debian/tmp/opt/trinity/lib/trinity/twin_plastik.la +debian/tmp/opt/trinity/lib/trinity/twin_plastik.so +debian/tmp/opt/trinity/lib/trinity/twin_quartz.la +debian/tmp/opt/trinity/lib/trinity/twin_quartz.so +debian/tmp/opt/trinity/lib/trinity/twin_redmond.la +debian/tmp/opt/trinity/lib/trinity/twin_redmond.so +debian/tmp/opt/trinity/lib/trinity/twin_web.la +debian/tmp/opt/trinity/lib/trinity/twin_web.so debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so debian/tmp/opt/trinity/lib/trinity/twin_default_config.la @@ -54,12 +54,11 @@ debian/tmp/opt/trinity/share/applications/tde/twindecoration.desktop debian/tmp/opt/trinity/share/applications/tde/twinoptions.desktop debian/tmp/opt/trinity/share/applications/tde/twinrules.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinactiveborders.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop -debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl -debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh |