diff --git a/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES index 1a164878c..44104bc40 100644 --- a/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/lenny/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -5,12 +5,10 @@ don't build-dep on gnokii or automake1.9 make kontact depend on kmail, korganizer, kaddressbook Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu remove debian/stamp-libtool-update: -kontact does not recommend kitchensync various Replaces/Conflicts (search for ubuntu) split out services/kontact/*desktop from kontact to indiviual apps add kandy*xpm to debian/icons and install lines to kandy.install remove clean:: rule -tdepim-dev does not depend on kitchensync Control has networkstatus-dev package and networkstatus package includes libnetworkstatus.so* files build-dep on gpgsm diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control index 8c23fa0e9..15833bb5c 100644 --- a/debian/lenny/tdepim/debian/control +++ b/debian/lenny/tdepim/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, libogg-dev, + flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libpisock-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-trinity (<< 4:14.0.0~) -Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kitchensync-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) +Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -251,21 +251,6 @@ Description: Trinity server configuration wizards This package is part of Trinity, and a component of the TDE PIM module. See the 'tde-trinity' and 'tdepim-trinity' packages for more information. -Package: kitchensync-trinity -Section: tde -Architecture: any -Replaces: kitchensync-trinity (<< 4:14.0.0~) -Breaks: kitchensync-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Suggests: konqueror-trinity -Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development (?). Kitchensync uses opensync. - . - This package is part of Trinity, and a component of the TDE PIM module. - See the 'tde-trinity' and 'tdepim-trinity' packages for more information. - Package: kleopatra-trinity Section: net Architecture: any diff --git a/debian/lenny/tdepim/debian/control.in b/debian/lenny/tdepim/debian/control.in index e75ea11d1..2ddddae56 100644 --- a/debian/lenny/tdepim/debian/control.in +++ b/debian/lenny/tdepim/debian/control.in @@ -6,8 +6,7 @@ XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9, cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, - libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + flex, groff-base, libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -19,7 +18,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) +Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -45,7 +44,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kitchensync (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) +Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: TDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -211,19 +210,6 @@ Description: TDE server configuration wizards This package is part of TDE, and a component of the TDE PIM module. See the 'tde' and 'tdepim' packages for more information. -Package: kitchensync -Section: tde -Architecture: any -Depends: ${shlibs:Depends} -Suggests: konqueror -Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1) -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development. Kitchensync uses opensync. - . - This package is part of TDE, and a component of the TDE PIM module. - See the 'tde' and 'tdepim' packages for more information. - Package: kleopatra Section: net Architecture: any @@ -323,7 +309,7 @@ Package: kontact Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes +Recommends: ${shlibs:Recommends}, kmail, knode, knotes Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin Conflicts: akregator-kontact-plugin diff --git a/debian/lenny/tdepim/debian/copyright b/debian/lenny/tdepim/debian/copyright index 340c4d607..921f3bdb3 100644 --- a/debian/lenny/tdepim/debian/copyright +++ b/debian/lenny/tdepim/debian/copyright @@ -25,7 +25,7 @@ When in doubt, check the individual file, they should all have license headings and other identifying marks. akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt, -tdefile-plugins, kgantt, tdeioslaves, kitchensync, kleopatra, kmail, +tdefile-plugins, kgantt, tdeioslaves, kleopatra, kmail, kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot, ksync, ktnef, libindex, libtdenetwork, libtdepim, libkleopatra, libkpimidentities, libksieve, mimelib, wizards diff --git a/debian/lenny/tdepim/debian/kitchensync-trinity.install b/debian/lenny/tdepim/debian/kitchensync-trinity.install deleted file mode 100644 index f22298aae..000000000 --- a/debian/lenny/tdepim/debian/kitchensync-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -/opt/trinity/bin/kitchensync -/opt/trinity/lib/trinity/libkitchensyncpart.la -/opt/trinity/lib/trinity/libkitchensyncpart.so -/opt/trinity/share/apps/kitchensync -/opt/trinity/lib/libkitchensync.so.0 -/opt/trinity/lib/libkitchensync.so.0.0.0 -/opt/trinity/lib/libqopensync.so.0 -/opt/trinity/lib/libqopensync.so.0.0.0 -/opt/trinity/share/applications/tde/kitchensync.desktop -/opt/trinity/share/icons/hicolor/16x16/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/22x22/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/32x32/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/48x48/apps/kitchensync.png diff --git a/debian/lenny/tdepim/debian/kitchensync-trinity.manpages b/debian/lenny/tdepim/debian/kitchensync-trinity.manpages deleted file mode 100644 index f921c8c0e..000000000 --- a/debian/lenny/tdepim/debian/kitchensync-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/out/kitchensync-trinity.1 -debian/man/out/multisynk-trinity.1 diff --git a/debian/lenny/tdepim/debian/kitchensync-trinity.menu b/debian/lenny/tdepim/debian/kitchensync-trinity.menu deleted file mode 100644 index 7630b49d8..000000000 --- a/debian/lenny/tdepim/debian/kitchensync-trinity.menu +++ /dev/null @@ -1,13 +0,0 @@ -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="KitchenSync"\ - command="/opt/trinity/bin/kitchensync" - -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="MultiSynk"\ - command="/opt/trinity/bin/multisynk" diff --git a/debian/lenny/tdepim/debian/man/kitchensync-trinity.man b/debian/lenny/tdepim/debian/man/kitchensync-trinity.man deleted file mode 100644 index 548ca86ee..000000000 --- a/debian/lenny/tdepim/debian/man/kitchensync-trinity.man +++ /dev/null @@ -1,11 +0,0 @@ -.TH KITCHENSYNC 1 -.SH NAME -kitchensync \- Synchronize Data with TDE -.SH SYNOPSIS -.B kitchensync -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B kitchensync -is a synchronization framework, still under heavy development. -.so kdeopt.part - diff --git a/debian/lenny/tdepim/debian/man/multisynk-trinity.man b/debian/lenny/tdepim/debian/man/multisynk-trinity.man deleted file mode 100644 index 8b206a978..000000000 --- a/debian/lenny/tdepim/debian/man/multisynk-trinity.man +++ /dev/null @@ -1,18 +0,0 @@ -.TH MULTISYNK 1 -.SH NAME -multisynk \- TDE synchronization application -.SH SYNOPSIS -.B multisynk -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B MultiSynk -is a frontend for TDE's synchronization framework kitchensync. This -framework lets you synchronize a lot of mobile devices like handhelds -and mobile phones with your Trinity desktop, but also offers the possibility -to synchronize two or more Trinity desktops directly. -.so kdeopt.part -.SH SEE ALSO -More detailed user documentation is available from -.BR help:/multisynk -(either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/multisynk'). diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules index 1e7824373..de88d019b 100755 --- a/debian/lenny/tdepim/debian/rules +++ b/debian/lenny/tdepim/debian/rules @@ -26,7 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DBUILD_KITCHENSYNC="ON" \ + -DBUILD_KITCHENSYNC="OFF" \ -DWITH_ARTS="ON" \ -DWITH_SASL="ON" \ -DWITH_NEWDISTRLISTS="ON" \ diff --git a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install index c890346c3..b05f93b98 100644 --- a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install +++ b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install @@ -74,13 +74,6 @@ /opt/trinity/lib/libkpinterfaces.so /opt/trinity/lib/libkslox.la /opt/trinity/lib/libkslox.so -/opt/trinity/lib/libkitchensync.la -/opt/trinity/lib/libkitchensync.so -/opt/trinity/lib/libqopensync.la -/opt/trinity/lib/libqopensync.so /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so - /opt/trinity/include/kpimprefs.h - -/opt/trinity/share/cmake diff --git a/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES index 1a164878c..44104bc40 100644 --- a/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/squeeze/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -5,12 +5,10 @@ don't build-dep on gnokii or automake1.9 make kontact depend on kmail, korganizer, kaddressbook Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu remove debian/stamp-libtool-update: -kontact does not recommend kitchensync various Replaces/Conflicts (search for ubuntu) split out services/kontact/*desktop from kontact to indiviual apps add kandy*xpm to debian/icons and install lines to kandy.install remove clean:: rule -tdepim-dev does not depend on kitchensync Control has networkstatus-dev package and networkstatus package includes libnetworkstatus.so* files build-dep on gpgsm diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control index 8c23fa0e9..15833bb5c 100644 --- a/debian/squeeze/tdepim/debian/control +++ b/debian/squeeze/tdepim/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, libogg-dev, + flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libpisock-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-trinity (<< 4:14.0.0~) -Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kitchensync-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) +Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -251,21 +251,6 @@ Description: Trinity server configuration wizards This package is part of Trinity, and a component of the TDE PIM module. See the 'tde-trinity' and 'tdepim-trinity' packages for more information. -Package: kitchensync-trinity -Section: tde -Architecture: any -Replaces: kitchensync-trinity (<< 4:14.0.0~) -Breaks: kitchensync-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Suggests: konqueror-trinity -Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development (?). Kitchensync uses opensync. - . - This package is part of Trinity, and a component of the TDE PIM module. - See the 'tde-trinity' and 'tdepim-trinity' packages for more information. - Package: kleopatra-trinity Section: net Architecture: any diff --git a/debian/squeeze/tdepim/debian/control.in b/debian/squeeze/tdepim/debian/control.in index e75ea11d1..2ddddae56 100644 --- a/debian/squeeze/tdepim/debian/control.in +++ b/debian/squeeze/tdepim/debian/control.in @@ -6,8 +6,7 @@ XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9, cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, - libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + flex, groff-base, libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -19,7 +18,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) +Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -45,7 +44,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kitchensync (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) +Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: TDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -211,19 +210,6 @@ Description: TDE server configuration wizards This package is part of TDE, and a component of the TDE PIM module. See the 'tde' and 'tdepim' packages for more information. -Package: kitchensync -Section: tde -Architecture: any -Depends: ${shlibs:Depends} -Suggests: konqueror -Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1) -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development. Kitchensync uses opensync. - . - This package is part of TDE, and a component of the TDE PIM module. - See the 'tde' and 'tdepim' packages for more information. - Package: kleopatra Section: net Architecture: any @@ -323,7 +309,7 @@ Package: kontact Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes +Recommends: ${shlibs:Recommends}, kmail, knode, knotes Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin Conflicts: akregator-kontact-plugin diff --git a/debian/squeeze/tdepim/debian/copyright b/debian/squeeze/tdepim/debian/copyright index 340c4d607..921f3bdb3 100644 --- a/debian/squeeze/tdepim/debian/copyright +++ b/debian/squeeze/tdepim/debian/copyright @@ -25,7 +25,7 @@ When in doubt, check the individual file, they should all have license headings and other identifying marks. akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt, -tdefile-plugins, kgantt, tdeioslaves, kitchensync, kleopatra, kmail, +tdefile-plugins, kgantt, tdeioslaves, kleopatra, kmail, kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot, ksync, ktnef, libindex, libtdenetwork, libtdepim, libkleopatra, libkpimidentities, libksieve, mimelib, wizards diff --git a/debian/squeeze/tdepim/debian/kitchensync-trinity.install b/debian/squeeze/tdepim/debian/kitchensync-trinity.install deleted file mode 100644 index f22298aae..000000000 --- a/debian/squeeze/tdepim/debian/kitchensync-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -/opt/trinity/bin/kitchensync -/opt/trinity/lib/trinity/libkitchensyncpart.la -/opt/trinity/lib/trinity/libkitchensyncpart.so -/opt/trinity/share/apps/kitchensync -/opt/trinity/lib/libkitchensync.so.0 -/opt/trinity/lib/libkitchensync.so.0.0.0 -/opt/trinity/lib/libqopensync.so.0 -/opt/trinity/lib/libqopensync.so.0.0.0 -/opt/trinity/share/applications/tde/kitchensync.desktop -/opt/trinity/share/icons/hicolor/16x16/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/22x22/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/32x32/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/48x48/apps/kitchensync.png diff --git a/debian/squeeze/tdepim/debian/kitchensync-trinity.manpages b/debian/squeeze/tdepim/debian/kitchensync-trinity.manpages deleted file mode 100644 index f921c8c0e..000000000 --- a/debian/squeeze/tdepim/debian/kitchensync-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/out/kitchensync-trinity.1 -debian/man/out/multisynk-trinity.1 diff --git a/debian/squeeze/tdepim/debian/kitchensync-trinity.menu b/debian/squeeze/tdepim/debian/kitchensync-trinity.menu deleted file mode 100644 index 7630b49d8..000000000 --- a/debian/squeeze/tdepim/debian/kitchensync-trinity.menu +++ /dev/null @@ -1,13 +0,0 @@ -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="KitchenSync"\ - command="/opt/trinity/bin/kitchensync" - -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="MultiSynk"\ - command="/opt/trinity/bin/multisynk" diff --git a/debian/squeeze/tdepim/debian/man/kitchensync-trinity.man b/debian/squeeze/tdepim/debian/man/kitchensync-trinity.man deleted file mode 100644 index 548ca86ee..000000000 --- a/debian/squeeze/tdepim/debian/man/kitchensync-trinity.man +++ /dev/null @@ -1,11 +0,0 @@ -.TH KITCHENSYNC 1 -.SH NAME -kitchensync \- Synchronize Data with TDE -.SH SYNOPSIS -.B kitchensync -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B kitchensync -is a synchronization framework, still under heavy development. -.so kdeopt.part - diff --git a/debian/squeeze/tdepim/debian/man/multisynk-trinity.man b/debian/squeeze/tdepim/debian/man/multisynk-trinity.man deleted file mode 100644 index 8b206a978..000000000 --- a/debian/squeeze/tdepim/debian/man/multisynk-trinity.man +++ /dev/null @@ -1,18 +0,0 @@ -.TH MULTISYNK 1 -.SH NAME -multisynk \- TDE synchronization application -.SH SYNOPSIS -.B multisynk -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B MultiSynk -is a frontend for TDE's synchronization framework kitchensync. This -framework lets you synchronize a lot of mobile devices like handhelds -and mobile phones with your Trinity desktop, but also offers the possibility -to synchronize two or more Trinity desktops directly. -.so kdeopt.part -.SH SEE ALSO -More detailed user documentation is available from -.BR help:/multisynk -(either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/multisynk'). diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules index 1da0c08ab..7af102822 100755 --- a/debian/squeeze/tdepim/debian/rules +++ b/debian/squeeze/tdepim/debian/rules @@ -26,7 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DBUILD_KITCHENSYNC="ON" \ + -DBUILD_KITCHENSYNC="OFF" \ -DWITH_ARTS="ON" \ -DWITH_SASL="ON" \ -DWITH_NEWDISTRLISTS="ON" \ diff --git a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install index c890346c3..b05f93b98 100644 --- a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install @@ -74,13 +74,6 @@ /opt/trinity/lib/libkpinterfaces.so /opt/trinity/lib/libkslox.la /opt/trinity/lib/libkslox.so -/opt/trinity/lib/libkitchensync.la -/opt/trinity/lib/libkitchensync.so -/opt/trinity/lib/libqopensync.la -/opt/trinity/lib/libqopensync.so /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so - /opt/trinity/include/kpimprefs.h - -/opt/trinity/share/cmake diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES index 1a164878c..44104bc40 100644 --- a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -5,12 +5,10 @@ don't build-dep on gnokii or automake1.9 make kontact depend on kmail, korganizer, kaddressbook Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu remove debian/stamp-libtool-update: -kontact does not recommend kitchensync various Replaces/Conflicts (search for ubuntu) split out services/kontact/*desktop from kontact to indiviual apps add kandy*xpm to debian/icons and install lines to kandy.install remove clean:: rule -tdepim-dev does not depend on kitchensync Control has networkstatus-dev package and networkstatus package includes libnetworkstatus.so* files build-dep on gpgsm diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control index 14dd2b2a0..20142de23 100644 --- a/ubuntu/maverick/tdepim/debian/control +++ b/ubuntu/maverick/tdepim/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, libogg-dev, + flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libpisock-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~) -Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kitchensync-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) +Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -251,21 +251,6 @@ Description: Trinity server configuration wizards This package is part of Trinity, and a component of the TDE PIM module. See the 'tde-trinity' and 'tdepim-trinity' packages for more information. -Package: kitchensync-trinity -Section: tde -Architecture: any -Replaces: kitchensync-kde3 (<< 4:14.0.0~), kitchensync-trinity (<< 4:14.0.0~) -Breaks: kitchensync-kde3 (<< 4:14.0.0~), kitchensync-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Suggests: konqueror-trinity -Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development (?). Kitchensync uses opensync. - . - This package is part of Trinity, and a component of the TDE PIM module. - See the 'tde-trinity' and 'tdepim-trinity' packages for more information. - Package: kleopatra-trinity Section: net Architecture: any diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in index e75ea11d1..2ddddae56 100644 --- a/ubuntu/maverick/tdepim/debian/control.in +++ b/ubuntu/maverick/tdepim/debian/control.in @@ -6,8 +6,7 @@ XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9, cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2, - flex, groff-base, libopensync0-dev, - libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + flex, groff-base, libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), @@ -19,7 +18,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) +Depends: akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}), kandy (>= ${source:Version}), karm (>= ${source:Version}), tdepim-tdefile-plugins (>= ${source:Version}), tdepim-kio-plugins (>= ${source:Version}), tdepim-tderesources (>= ${source:Version}), tdepim-wizards (>= ${source:Version}), kleopatra (>= ${source:Version}), kmail (>= ${source:Version}), kmailcvt (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}), ktnef (>= ${source:Version}), networkstatus (>= ${source:Version}), libindex0 (>= ${source:Version}), libkcal2b (>= ${source:Version}), libtdepim1a (>= ${source:Version}), libkgantt0 (>= ${source:Version}), libkleopatra1 (>= ${source:Version}), libkpimexchange1 (>= ${source:Version}), libkpimidentities1 (>= ${source:Version}), libksieve0 (>= ${source:Version}), libktnef1 (>= ${source:Version}), libmimelib1c2a (>= ${source:Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -45,7 +44,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kitchensync (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) +Depends: kaddressbook (= ${source:Version}), kalarm (= ${source:Version}), tdepim-tderesources (= ${source:Version}), kmail (= ${source:Version}), knotes (= ${source:Version}), kontact (= ${source:Version}), korganizer (= ${source:Version}), libkpimidentities1 (= ${source:Version}), libkcal2-dev (= ${source:Version}), libtdepim1-dev (= ${source:Version}), libkgantt0-dev (= ${source:Version}), libkleopatra1-dev (= ${source:Version}), libkpimexchange1-dev (= ${source:Version}), libksieve0-dev (= ${source:Version}), libktnef1-dev (= ${source:Version}), libmimelib1-dev (= ${source:Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: TDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -211,19 +210,6 @@ Description: TDE server configuration wizards This package is part of TDE, and a component of the TDE PIM module. See the 'tde' and 'tdepim' packages for more information. -Package: kitchensync -Section: tde -Architecture: any -Depends: ${shlibs:Depends} -Suggests: konqueror -Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1) -Description: Synchronization framework - This package contains a synchronization framework, still under heavy - development. Kitchensync uses opensync. - . - This package is part of TDE, and a component of the TDE PIM module. - See the 'tde' and 'tdepim' packages for more information. - Package: kleopatra Section: net Architecture: any @@ -323,7 +309,7 @@ Package: kontact Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes +Recommends: ${shlibs:Recommends}, kmail, knode, knotes Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin Conflicts: akregator-kontact-plugin diff --git a/ubuntu/maverick/tdepim/debian/copyright b/ubuntu/maverick/tdepim/debian/copyright index 340c4d607..921f3bdb3 100644 --- a/ubuntu/maverick/tdepim/debian/copyright +++ b/ubuntu/maverick/tdepim/debian/copyright @@ -25,7 +25,7 @@ When in doubt, check the individual file, they should all have license headings and other identifying marks. akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt, -tdefile-plugins, kgantt, tdeioslaves, kitchensync, kleopatra, kmail, +tdefile-plugins, kgantt, tdeioslaves, kleopatra, kmail, kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot, ksync, ktnef, libindex, libtdenetwork, libtdepim, libkleopatra, libkpimidentities, libksieve, mimelib, wizards diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.install b/ubuntu/maverick/tdepim/debian/kitchensync-trinity.install deleted file mode 100644 index f22298aae..000000000 --- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.install +++ /dev/null @@ -1,13 +0,0 @@ -/opt/trinity/bin/kitchensync -/opt/trinity/lib/trinity/libkitchensyncpart.la -/opt/trinity/lib/trinity/libkitchensyncpart.so -/opt/trinity/share/apps/kitchensync -/opt/trinity/lib/libkitchensync.so.0 -/opt/trinity/lib/libkitchensync.so.0.0.0 -/opt/trinity/lib/libqopensync.so.0 -/opt/trinity/lib/libqopensync.so.0.0.0 -/opt/trinity/share/applications/tde/kitchensync.desktop -/opt/trinity/share/icons/hicolor/16x16/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/22x22/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/32x32/apps/kitchensync.png -/opt/trinity/share/icons/hicolor/48x48/apps/kitchensync.png diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.manpages b/ubuntu/maverick/tdepim/debian/kitchensync-trinity.manpages deleted file mode 100644 index f921c8c0e..000000000 --- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/out/kitchensync-trinity.1 -debian/man/out/multisynk-trinity.1 diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu b/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu deleted file mode 100644 index 7630b49d8..000000000 --- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu +++ /dev/null @@ -1,13 +0,0 @@ -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="KitchenSync"\ - command="/opt/trinity/bin/kitchensync" - -?package(kitchensync-trinity):\ - needs="X11"\ - section="Applications/Data Management"\ - hints="TDE"\ - title="MultiSynk"\ - command="/opt/trinity/bin/multisynk" diff --git a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man b/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man deleted file mode 100644 index 548ca86ee..000000000 --- a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man +++ /dev/null @@ -1,11 +0,0 @@ -.TH KITCHENSYNC 1 -.SH NAME -kitchensync \- Synchronize Data with TDE -.SH SYNOPSIS -.B kitchensync -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B kitchensync -is a synchronization framework, still under heavy development. -.so kdeopt.part - diff --git a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man b/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man deleted file mode 100644 index 8b206a978..000000000 --- a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man +++ /dev/null @@ -1,18 +0,0 @@ -.TH MULTISYNK 1 -.SH NAME -multisynk \- TDE synchronization application -.SH SYNOPSIS -.B multisynk -.I [Qt-options] [TDE-options] -.SH DESCRIPTION -.B MultiSynk -is a frontend for TDE's synchronization framework kitchensync. This -framework lets you synchronize a lot of mobile devices like handhelds -and mobile phones with your Trinity desktop, but also offers the possibility -to synchronize two or more Trinity desktops directly. -.so kdeopt.part -.SH SEE ALSO -More detailed user documentation is available from -.BR help:/multisynk -(either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/multisynk'). diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules index 1da0c08ab..7af102822 100755 --- a/ubuntu/maverick/tdepim/debian/rules +++ b/ubuntu/maverick/tdepim/debian/rules @@ -26,7 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DBUILD_KITCHENSYNC="ON" \ + -DBUILD_KITCHENSYNC="OFF" \ -DWITH_ARTS="ON" \ -DWITH_SASL="ON" \ -DWITH_NEWDISTRLISTS="ON" \ diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install index c890346c3..b05f93b98 100644 --- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install @@ -74,13 +74,6 @@ /opt/trinity/lib/libkpinterfaces.so /opt/trinity/lib/libkslox.la /opt/trinity/lib/libkslox.so -/opt/trinity/lib/libkitchensync.la -/opt/trinity/lib/libkitchensync.so -/opt/trinity/lib/libqopensync.la -/opt/trinity/lib/libqopensync.so /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so - /opt/trinity/include/kpimprefs.h - -/opt/trinity/share/cmake