--- kdepim-3.5.7enterprise20070810.orig/plugins/kmail/bodypartformatter/ui_attendeeselector.rc.cpp +++ kdepim-3.5.7enterprise20070810/plugins/kmail/bodypartformatter/ui_attendeeselector.rc.cpp @@ -0,0 +1,27 @@ +//i18n: file ui_attendeeselector.ui line 17 +// xgettext: no-c-format +i18n("AttendeeSelectorWidget"); +//i18n: file ui_attendeeselector.ui line 31 +// xgettext: no-c-format +i18n("Add"); +//i18n: file ui_attendeeselector.ui line 42 +// xgettext: no-c-format +i18n("Remove"); +//i18n: file ui_attendeeselector.ui line 17 +// xgettext: no-c-format +i18n("AttendeeSelectorWidget"); +//i18n: file ui_attendeeselector.ui line 31 +// xgettext: no-c-format +i18n("Add"); +//i18n: file ui_attendeeselector.ui line 42 +// xgettext: no-c-format +i18n("Remove"); +//i18n: file ui_attendeeselector.ui line 17 +// xgettext: no-c-format +i18n("AttendeeSelectorWidget"); +//i18n: file ui_attendeeselector.ui line 31 +// xgettext: no-c-format +i18n("Add"); +//i18n: file ui_attendeeselector.ui line 42 +// xgettext: no-c-format +i18n("Remove"); --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/kubuntu_01_kdepot.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/common/kubuntu_01_kdepot.diff @@ -0,0 +1,26 @@ +--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 ++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/kde/kde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,10 +556,10 @@ + fi + perl -e '$mes=0; while () { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- if ! test -f $kdepotpath; then +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- fi ++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# if ! test -f $kdepotpath; then ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# fi + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/update.sh +++ kdepim-3.5.7enterprise20070810/debian/patches/common/update.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +ADMIN="$1" + +test -d "$ADMIN" || { + echo >&2 "Error, admin dir '$ADMIN' does not exist." + exit 1 +} + +rm -rf a b +mkdir a b + +cp -a "$ADMIN" a/admin + +############################################################ +PATCH=03_libtool_update.diff +rm -rf b/admin; cp -a a/admin b + +cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in +cp -f /usr/share/libtool/ltmain.sh b/admin/ltmain.sh + +diff -Nrua a b >$PATCH +############################################################ + + +############################################################ +PATCH=02_autotools_update.diff +AUTOMAKE_DIR=/usr/share/automake-1.9 +rm -rf b/admin; cp -a a/admin b + +( cd b/admin + for file in *; do + case "$file" in + config.guess|config.sub) + continue + ;; + esac + if test -r "$AUTOMAKE_DIR/$file"; then + cp -f "$AUTOMAKE_DIR/$file" "$file" + fi + done +) + +diff -Nrua a b >$PATCH +############################################################ + +rm -rf a b --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/04_am_maintainer_mode.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/common/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/05_pedantic-errors.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/common/05_pedantic-errors.diff @@ -0,0 +1,12 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -2144,9 +2144,6 @@ + save_CXXFLAGS="$CXXFLAGS" + kde_safe_LIBS="$LIBS" + LIBS="$LIBS $X_EXTRA_LIBS" +-if test "$GXX" = "yes"; then +-CXXFLAGS="$CXXFLAGS -pedantic-errors" +-fi + AC_TRY_COMPILE([ + $2 + ], --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/06_disable_no_undefined.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/common/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) --- kdepim-3.5.7enterprise20070810.orig/debian/patches/common/README +++ kdepim-3.5.7enterprise20070810/debian/patches/common/README @@ -0,0 +1,14 @@ +Common patches across KDE Debian packages +========================================= + + These directory should contain patches to the admin/ subdir of KDE + modules that are meant to be applied to all packaged modules. As the + admin/ subdir is shared across modules (and so, it's identical for all + modules at a certain version), I think it makes sense to have these + patches in a central location, and update them here. + + The script update.sh takes care of automatically updating the patches + that update autotools and libtool. You need to pass the location of an + admin/ directory as the first argument. + + -- Adeodato Simó, 2005-02-26 --- kdepim-3.5.7enterprise20070810.orig/debian/patches/18_optimize_splitAddressInternal.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/18_optimize_splitAddressInternal.diff @@ -0,0 +1,137 @@ +Index: libemailfunctions/email.cpp +=================================================================== +--- libemailfunctions/email.cpp (Revision 599840) ++++ libemailfunctions/email.cpp (Arbeitskopie) +@@ -111,7 +111,14 @@ + displayName = ""; + addrSpec = ""; + comment = ""; +- ++ ++ // these strings are later copied to displayName resp. addrSpec resp. comment ++ // we don't operate directly on those variables, since as ByteArray deriverates ++ // they have a miserable performance on operator+ ++ QString dName; ++ QString aSpec; ++ QString cmmt; ++ + if ( address.isEmpty() ) + return KPIM::AddressEmpty; + +@@ -129,26 +136,26 @@ + case TopLevel : { + switch ( *p ) { + case '"' : inQuotedString = !inQuotedString; +- displayName += *p; ++ dName += *p; + break; + case '(' : if ( !inQuotedString ) { + context = InComment; + commentLevel = 1; + } + else +- displayName += *p; ++ dName += *p; + break; + case '<' : if ( !inQuotedString ) { + context = InAngleAddress; + } + else +- displayName += *p; ++ dName += *p; + break; + case '\\' : // quoted character +- displayName += *p; ++ dName += *p; + ++p; // skip the '\' + if ( *p ) +- displayName += *p; ++ dName += *p; + else + return KPIM::UnexpectedEnd; + break; +@@ -159,57 +166,57 @@ + return KPIM::UnexpectedComma; + } + else +- displayName += *p; ++ dName += *p; + break; +- default : displayName += *p; ++ default : dName += *p; + } + break; + } + case InComment : { + switch ( *p ) { + case '(' : ++commentLevel; +- comment += *p; ++ cmmt += *p; + break; + case ')' : --commentLevel; + if ( commentLevel == 0 ) { + context = TopLevel; +- comment += ' '; // separate the text of several comments ++ cmmt += ' '; // separate the text of several comments + } + else +- comment += *p; ++ cmmt += *p; + break; + case '\\' : // quoted character +- comment += *p; ++ cmmt += *p; + ++p; // skip the '\' + if ( *p ) +- comment += *p; ++ cmmt += *p; + else + return KPIM::UnexpectedEnd; + break; +- default : comment += *p; ++ default : cmmt += *p; + } + break; + } + case InAngleAddress : { + switch ( *p ) { + case '"' : inQuotedString = !inQuotedString; +- addrSpec += *p; ++ aSpec += *p; + break; + case '>' : if ( !inQuotedString ) { + context = TopLevel; + } + else +- addrSpec += *p; ++ aSpec += *p; + break; + case '\\' : // quoted character +- addrSpec += *p; ++ aSpec += *p; + ++p; // skip the '\' + if ( *p ) +- addrSpec += *p; ++ aSpec += *p; + else + return KPIM::UnexpectedEnd; + break; +- default : addrSpec += *p; ++ default : aSpec += *p; + } + break; + } +@@ -223,9 +230,10 @@ + if ( context == InAngleAddress ) + return KPIM::UnclosedAngleAddr; + +- displayName = displayName.stripWhiteSpace(); +- comment = comment.stripWhiteSpace(); +- addrSpec = addrSpec.stripWhiteSpace(); ++ ++ displayName = dName.stripWhiteSpace().latin1(); ++ comment = cmmt.stripWhiteSpace().latin1(); ++ addrSpec = aSpec.stripWhiteSpace().latin1(); + + if ( addrSpec.isEmpty() ) { + if ( displayName.isEmpty() ) --- kdepim-3.5.7enterprise20070810.orig/debian/patches/kubuntu_01_kmenu_tidy.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/kubuntu_01_kmenu_tidy.diff @@ -0,0 +1,32 @@ +diff -Nur kdepim-3.5.7enterprise20070808/kaddressbook/kaddressbook.desktop kdepim-3.5.7enterprise20070808.new/kaddressbook/kaddressbook.desktop +--- kdepim-3.5.7enterprise20070808/kaddressbook/kaddressbook.desktop 2007-08-08 17:50:23.000000000 +0100 ++++ kdepim-3.5.7enterprise20070808.new/kaddressbook/kaddressbook.desktop 2007-08-08 18:16:38.000000000 +0100 +@@ -72,3 +72,4 @@ + ServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook + X-KDE-Library=libkaddressbookpart + Categories=Qt;KDE;Office;ContactManagement; ++NoDisplay=true +diff -Nur kdepim-3.5.7enterprise20070808/kmail/KMail.desktop kdepim-3.5.7enterprise20070808.new/kmail/KMail.desktop +--- kdepim-3.5.7enterprise20070808/kmail/KMail.desktop 2007-08-08 17:49:43.000000000 +0100 ++++ kdepim-3.5.7enterprise20070808.new/kmail/KMail.desktop 2007-08-08 18:16:22.000000000 +0100 +@@ -84,3 +84,4 @@ + X-DCOP-ServiceType=Unique + X-DCOP-ServiceName=kmail + Categories=Qt;KDE;Network;Office;Email; ++NoDisplay=true +diff -Nur kdepim-3.5.7enterprise20070808/knode/KNode.desktop kdepim-3.5.7enterprise20070808.new/knode/KNode.desktop +--- kdepim-3.5.7enterprise20070808/knode/KNode.desktop 2007-08-08 17:49:52.000000000 +0100 ++++ kdepim-3.5.7enterprise20070808.new/knode/KNode.desktop 2007-08-08 18:19:22.000000000 +0100 +@@ -78,3 +78,4 @@ + X-KDE-StartupNotify=true + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;Network;News; ++NoDisplay=true +diff -Nur kdepim-3.5.7enterprise20070808/korganizer/korganizer.desktop kdepim-3.5.7enterprise20070808.new/korganizer/korganizer.desktop +--- kdepim-3.5.7enterprise20070808/korganizer/korganizer.desktop 2007-08-08 17:51:23.000000000 +0100 ++++ kdepim-3.5.7enterprise20070808.new/korganizer/korganizer.desktop 2007-08-08 18:17:28.000000000 +0100 +@@ -137,3 +137,4 @@ + X-DCOP-ServiceType=Unique + X-DCOP-ServiceName=korganizer + Categories=Qt;KDE;Office;ProjectManagement; ++NoDisplay=true --- kdepim-3.5.7enterprise20070810.orig/debian/patches/13_mimelib_self_contained.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/13_mimelib_self_contained.diff @@ -0,0 +1,25 @@ +diff -Nur kdepim-3.5.4/mimelib/Makefile.am kdepim-3.5.4.new/mimelib/Makefile.am +--- kdepim-3.5.4/mimelib/Makefile.am 2005-09-10 10:24:49.000000000 +0200 ++++ kdepim-3.5.4.new/mimelib/Makefile.am 2006-08-18 15:31:28.000000000 +0200 +@@ -57,7 +57,7 @@ + uuencode.cpp \ + binhex.cpp + +-libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes -version-info 1:1 -no-undefined ++libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes_pic -version-info 1:1 -no-undefined + + check_PROGRAMS = test_boyermor + +diff -Nur kdepim-3.5.4/mimelib/mimelib/config.h kdepim-3.5.4.new/mimelib/mimelib/config.h +--- kdepim-3.5.4/mimelib/mimelib/config.h 2005-09-10 10:24:49.000000000 +0200 ++++ kdepim-3.5.4.new/mimelib/mimelib/config.h 2006-08-18 15:32:05.000000000 +0200 +@@ -125,8 +125,7 @@ + # define DW_EXPORT __declspec(dllimport) + # endif + #else +-# include +-# define DW_EXPORT KDE_EXPORT ++# define DW_EXPORT /* empty */ + #endif + + //----------------------------------------------------------------------------- --- kdepim-3.5.7enterprise20070810.orig/debian/patches/14_kmail_filter_icons.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/14_kmail_filter_icons.diff @@ -0,0 +1,64 @@ +diff -Nur kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl +--- kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl 1970-01-01 01:00:00.000000000 +0100 ++++ kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl 2006-08-18 15:46:03.000000000 +0200 +@@ -0,0 +1,22 @@ ++#!/usr/bin/perl -w ++ ++use strict; ++ ++# This script updates some configuration keys ++ ++# read the whole config file ++my $currentGroup = ""; ++my %configFile; ++while ( <> ) { ++ chomp; # eat the trailing '\n' ++ next if ( /^$/ ); # skip empty lines ++ next if ( /^\#/ ); # skip comments ++ if ( /^\[/ ) { # group begin ++ $currentGroup = $_; ++ next; ++ } elsif ( $currentGroup =~ /^\[Filter #[0-9]+\]$/ && /^Icon=/ ) { ++ my ($key,$value) = split /=/; ++ print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_spam\n" if $value eq "mark_as_spam"; ++ print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_ham\n" if $value eq "mark_as_ham"; ++ } ++} +diff -Nur kdepim-3.5.4/kmail/kmail.upd kdepim-3.5.4.new/kmail/kmail.upd +--- kdepim-3.5.4/kmail/kmail.upd 2006-07-22 10:14:16.000000000 +0200 ++++ kdepim-3.5.4.new/kmail/kmail.upd 2006-08-18 15:47:36.000000000 +0200 +@@ -158,6 +158,10 @@ + Id=3.4.1 + File=kmailrc + Script=kmail-3.4.1-update-status-filters.pl,perl ++# Update icon names for spam/ham filters ++Id=3.5-filter-icons ++File=kmailrc ++Script=kmail-3.5-filter-icons.pl,perl + # Remove the stored size so that we get a reasonable default now that we have 2 columns in the folder selection dialog + Id=3.5.4 + File=kmailrc +diff -Nur kdepim-3.5.4/kmail/kmstartup.cpp kdepim-3.5.4.new/kmail/kmstartup.cpp +--- kdepim-3.5.4/kmail/kmstartup.cpp 2006-07-22 10:14:16.000000000 +0200 ++++ kdepim-3.5.4.new/kmail/kmstartup.cpp 2006-08-18 15:48:04.000000000 +0200 +@@ -114,6 +114,7 @@ + "3.4a", + "3.4b", + "3.4.1", ++ "3.5-filter-icons", + "3.5.4" + }; + static const int numUpdates = sizeof updates / sizeof *updates; +diff -Nur kdepim-3.5.4/kmail/Makefile.am kdepim-3.5.4.new/kmail/Makefile.am +--- kdepim-3.5.4/kmail/Makefile.am 2006-08-18 15:39:43.000000000 +0200 ++++ kdepim-3.5.4.new/kmail/Makefile.am 2006-08-18 15:49:08.000000000 +0200 +@@ -175,7 +175,8 @@ + kmail-3.3-misc.pl \ + kmail-3.3b1-misc.pl \ + kmail-3.4-misc.pl \ +- kmail-3.4.1-update-status-filters.pl ++ kmail-3.4.1-update-status-filters.pl \ ++ kmail-3.5-filter-icons.pl + + confdir = $(kde_confdir) + conf_DATA = kmail.antispamrc kmail.antivirusrc --- kdepim-3.5.7enterprise20070810.orig/debian/patches/12_kmail_clamav_fix.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/12_kmail_clamav_fix.diff @@ -0,0 +1,11 @@ +--- kde.orig/kmail/avscripts/kmail_clamav.sh ++++ kde.patched/kmail/avscripts/kmail_clamav.sh +@@ -35,7 +35,7 @@ + cat > $TEMPFILE + + # check for a running daemon +-if [ "`ps -eo comm|grep clamd`" = "clamd" ]; then ++if ps -eo comm | grep -q clamd ; then + chmod a+r $TEMPFILE + CLAMCOMANDO="clamdscan --stdout --no-summary " + else --- kdepim-3.5.7enterprise20070810.orig/debian/patches/kubuntu_10_kmail_networkstatus_support.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/kubuntu_10_kmail_networkstatus_support.diff @@ -0,0 +1,45 @@ +--- kmail/accountmanager.cpp ++++ kmail/accountmanager.cpp +@@ -17,6 +17,7 @@ + #include "kmfiltermgr.h" + #include "globalsettings.h" + ++#include + #include + #include + #include +@@ -182,6 +183,34 @@ + return; + } + ++ if ( curAccount->type() == "imap" || curAccount->type() == "cachedimap" || curAccount->type() == "pop" ) ++ { ++ // Check with the network status daemon whether the network is available ++ const int NetWorkStatusUnknown = 1; ++ const int NetWorkStatusOnline = 8; ++ QCString replyType; ++ QByteArray params; ++ QByteArray reply; ++ ++ QDataStream stream( params, IO_WriteOnly ); ++ stream << static_cast( curAccount )->host(); ++ ++ if ( kapp->dcopClient()->call( "kded", "networkstatus", "status(QString)", ++ params, replyType, reply ) && ( replyType == "int" ) ) ++ { ++ int result; ++ QDataStream stream2( reply, IO_ReadOnly ); ++ stream2 >> result; ++ kdDebug() << k_funcinfo << "networkstatus status = " << result << endl; ++ // if it's not unknown (no networks announced by network control apps), and not offline, give up now ++ if ( ( result != NetWorkStatusUnknown ) && ( result != NetWorkStatusOnline ) ) ++ { ++ emit checkedMail( false, mInteractive, mTotalNewInFolder ); ++ return; ++ } ++ } ++ } ++ + connect( curAccount, SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, SLOT( processNextCheck( bool ) ) ); + --- kdepim-3.5.7enterprise20070810.orig/debian/patches/26_dimap_warning.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/26_dimap_warning.diff @@ -0,0 +1,21 @@ +Index: kdepim/kmail/configuredialog.cpp +=================================================================== +--- kdepim/kmail/configuredialog.cpp (revision 623910) ++++ kdepim/kmail/configuredialog.cpp (working copy) +@@ -1200,6 +1200,16 @@ + return; + } + ++ if ( accountType == "cachedimap" ) ++ { ++ KMessageBox::information(this, " WARNING:\n\n It is possible to lose your e-mail with a Disconnected IMAP account if you do not use it correctly. The purposes of Disconnected IMAP are to minimize bandwidth usage, to allow the user to decide when the client communicates with the server, and to keep a local copy of all e-mails.\n\n When using Disconnected IMAP, all changes (such as writing new e-mails, deleting e-mails, and moving e-mails between folders or accounts) are only made on the client until the user synchronizes the client with the server by using the Check Mail command when there is a network connection available.\n\n These are the commands that affect client-server syncronization:\n F5 synchronizes the current folder.\n Ctrl+L (Check Mail) synchronizes all folders in all accounts.\n Refresh Local IMAP Cache discards all local changes in the current folder.\n\n If you make changes that affect more than one folder or account, you should usually use Ctrl+L to make sure all of your changes are committed to the mail server. ", ++ NULL, "dimap-warning", 0 ++ ++ ++ ); ++ ++ } ++ + KMAccount *account + = kmkernel->acctMgr()->create( QString::fromLatin1( accountType ) ); + if ( !account ) { --- kdepim-3.5.7enterprise20070810.orig/debian/patches/kubuntu_06_add_akregator_feed.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/kubuntu_06_add_akregator_feed.diff @@ -0,0 +1,24 @@ +--- kdepim/akregator/src/akregator_part.cpp 2006-05-05 11:39:51.000000000 +0100 ++++ kdepim/akregator/src/akregator_part.cpp 2006-05-05 11:42:04.000000000 +0100 +@@ -384,6 +384,21 @@ + look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf"); + mainFolder.appendChild(look); + ++ QDomElement kubuntu = doc.createElement( "outline" ); ++ kubuntu.setAttribute("text",i18n("Kubuntu")); ++ kubuntu.setAttribute("xmlUrl","http://kubuntu.org/kubuntu.rss"); ++ mainFolder.appendChild(kubuntu); ++ ++ QDomElement fridge = doc.createElement( "outline" ); ++ fridge.setAttribute("text",i18n("Ubuntu Fridge")); ++ fridge.setAttribute("xmlUrl","http://fridge.ubuntu.com/node/feed"); ++ mainFolder.appendChild(fridge); ++ ++ QDomElement planetubuntu = doc.createElement( "outline" ); ++ planetubuntu.setAttribute("text",i18n("Planet Ubuntu")); ++ planetubuntu.setAttribute("xmlUrl","http://planet.ubuntu.com/rss20.xml"); ++ mainFolder.appendChild(planetubuntu); ++ + return doc; + } + --- kdepim-3.5.7enterprise20070810.orig/debian/patches/kubuntu_08_kalarm_autostart_kdeonly.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/kubuntu_08_kalarm_autostart_kdeonly.diff @@ -0,0 +1,8 @@ +diff -Nur kdepim-3.5.7enterprise20070808/kalarm/kalarm.desktop kdepim-3.5.7enterprise20070808.new/kalarm/kalarm.desktop +--- kdepim-3.5.7enterprise20070808/kalarm/kalarm.desktop 2007-08-08 17:50:10.000000000 +0100 ++++ kdepim-3.5.7enterprise20070808.new/kalarm/kalarm.desktop 2007-08-08 18:21:05.000000000 +0100 +@@ -70,3 +70,4 @@ + X-DCOP-ServiceType=Unique + X-KDE-StartupNotify=true + Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;Office;Calendar; ++OnlyShowIn=KDE; --- kdepim-3.5.7enterprise20070810.orig/debian/patches/30_debianize_akregator_default.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/30_debianize_akregator_default.diff @@ -0,0 +1,25 @@ +Index: kdepim/akregator/src/akregator_part.cpp +=================================================================== +--- kdepim/akregator/src/akregator_part.cpp (revision 653121) ++++ kdepim/akregator/src/akregator_part.cpp (working copy) +@@ -392,6 +392,20 @@ + look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf"); + mainFolder.appendChild(look); + ++ QDomElement debianFolder = doc.createElement( "outline" ); ++ debianFolder.setAttribute("text","Debian"); ++ body.appendChild(debianFolder); ++ ++ QDomElement pland = doc.createElement( "outline" ); ++ pland.setAttribute("text",i18n("Planet Debian")); ++ pland.setAttribute("xmlUrl","http://planet.debian.org/rss20.xml"); ++ debianFolder.appendChild(pland); ++ ++ QDomElement dtimes = doc.createElement( "outline" ); ++ dtimes.setAttribute("text",i18n("Debian Times")); ++ dtimes.setAttribute("xmlUrl","http://times.debian.net/?format=rss20.xml"); ++ debianFolder.appendChild(dtimes); ++ + return doc; + } + --- kdepim-3.5.7enterprise20070810.orig/debian/patches/kubuntu_09_install_networkstatus_headers.diff +++ kdepim-3.5.7enterprise20070810/debian/patches/kubuntu_09_install_networkstatus_headers.diff @@ -0,0 +1,35 @@ +--- libkdepim/Makefile.am ++++ libkdepim/Makefile.am 2005/02/07 16:51:07 +@@ -45,7 +45,7 @@ + $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui + # $top_builddir)/libkdepim/resources/libkpimresources.la + +-include_HEADERS = kdepimmacros.h ++include_HEADERS = kdepimmacros.h kpimprefs.h + + AM_CXXFLAGS = -DQT_PLUGIN + kde_widget_LTLIBRARIES = kdepimwidgets.la +--- networkstatus/Makefile.am ++++ networkstatus/Makefile.am 2005/02/07 16:52:10 +@@ -3,7 +3,7 @@ + METASOURCES = AUTO + + kde_module_LTLIBRARIES = kded_networkstatus.la +-noinst_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la ++lib_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la + + libnetworkstatus_la_LIBADD = $(LIB_KDECORE) + libnetworkstatus_la_LDFLAGS = $(all_libraries) +@@ -24,8 +24,10 @@ + servicesdir = $(kde_servicesdir)/kded + services_DATA = networkstatus.desktop + +-noinst_HEADERS = serviceiface.h networkstatuscommon.h serviceifaceimpl.h \ +- network.h clientifaceimpl.h provideriface.h testservice.h connectionmanager.h ++noinst_HEADERS = serviceifaceimpl.h \ ++ network.h clientifaceimpl.h testservice.h connectionmanager.h ++ ++include_HEADERS = serviceiface.h provideriface.h networkstatuscommon.h + + bin_PROGRAMS = networkstatustestservice + --- kdepim-3.5.7enterprise20070810.orig/debian/man/networkstatustestservice.man +++ kdepim-3.5.7enterprise20070810/debian/man/networkstatustestservice.man @@ -0,0 +1,15 @@ +.TH NETWORKSTATUSTESTSERVICE 1 +.SH NAME +networkstatustestservice \- Test application for the NetworkStatus monitor +.SH SYNOPSIS +.B networkstatustestservice +.I [Qt-options] [KDE-options] +.SH DESCRIPTION +.B networkstatustestservice +sets up a test application for the KDE network status monitor. After it +starts, you can communicate with it using +.B dcop +(1). +.SH PROGRAM OPTIONS +.TP +.so kdeopt.part --- kdepim-3.5.7enterprise20070810.orig/debian/man/kwatchgnupg.man +++ kdepim-3.5.7enterprise20070810/debian/man/kwatchgnupg.man @@ -0,0 +1,17 @@ +.TH KWATCHGNUPG 1 +.SH NAME +kwatchgnupg \- GnuPG log viewer +.SH SYNOPSIS +.B kwatchgnupg +.I [Qt-options] [KDE-options] +.SH DESCRIPTION +.B KWatchGnuPG +is a simple GnuPG log viewer for GnuPG. It works as a GUI wrapper around +the command line tool \fBwatchgnupg\fP, which listens on a socket for log lines +from the GnuPG backend applications. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/kwatchgnupg +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/kwatchgnupg'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/kmailcvt.man +++ kdepim-3.5.7enterprise20070810/debian/man/kmailcvt.man @@ -0,0 +1,15 @@ +.TH KMAILCVT 1 +.SH NAME +kmailcvt \- KMail import filters +.SH SYNOPSIS +.B kmailcvt +.I [Qt-options] [KDE-options] +.SH DESCRIPTION +.B kmailcvt +provides a frontend to import mail folders into \fBkmail\fP. Supported +formats include Outlook Express, mbox files, plain text, Pegasus-Mail, +and Evolution. +.so kdeopt.part +.SH SEE ALSO +.B kmail +(1). --- kdepim-3.5.7enterprise20070810.orig/debian/man/knode.man +++ kdepim-3.5.7enterprise20070810/debian/man/knode.man @@ -0,0 +1,21 @@ +.TH KNODE 1 +.SH NAME +knode \- KDE news reader +.SH SYNOPSIS +.B knode +.I [Qt-options] [KDE-options] [url] +.SH DESCRIPTION +.B KNode +is an easy-to-use, convenient newsreader; it is intended to allow even +newbies to use a newsreader under KDE, but it also offers advanced features +appealing to experienced users. +.SH PROGRAM OPTIONS +.TP +.B url +A `news://server/group' URL. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/knode +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/knode'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/kaddressbook.man +++ kdepim-3.5.7enterprise20070810/debian/man/kaddressbook.man @@ -0,0 +1,41 @@ +.TH KADDRESSBOOK 1 +.SH NAME +kaddressbook \- The KDE Address Book +.SH SYNOPSIS +.B kaddressbook +.I [Qt-options] [KDE-options] [options] +.SH DESCRIPTION +\fBKAddressBook\fP is the main address book application for KDE; it enables +you to manage your contacts efficiently and comfortably. Since it is based +on the kabc library it supports resources, which can be used to load and save +your contacts to many different locations -- not just the local file system, +but also to LDAP servers and SQL databases. + +The user interface is similar to MS Outlook and it supports different views +to represent the contact data differently; it also provides an incremental +search over all fields and a jump button bar to quickly access single entries. +Since the underlying kabc library uses the vCard format (specified in RFC 2426) +as its default storage medium, KAddressBook mainly reflects the supported +entry fields in its graphical user interface. +.SH PROGRAM OPTIONS +.TP +.B -a, --addr \fI\fB +Shows contact editor with given email address. +.TP +.B --uid \fI\fB +Shows contact editor with given uid. +.TP +.B --editor-only +Launches in editor only mode. +.TP +.B --new-contact +Launches editor for the new contact. +.TP +.B --document \fI\fB +Work on given file. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/kaddressbook +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/kaddressbook'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/multisynk.man +++ kdepim-3.5.7enterprise20070810/debian/man/multisynk.man @@ -0,0 +1,18 @@ +.TH MULTISYNK 1 +.SH NAME +multisynk \- KDE synchronization application +.SH SYNOPSIS +.B multisynk +.I [Qt-options] [KDE-options] +.SH DESCRIPTION +.B MultiSynk +is a frontend for KDE's synchronization framework kitchensync. This +framework lets you synchronize a lot of mobile devices like handhelds +and mobile phones with your KDE desktop, but also offers the possibility +to synchronize two or more KDE 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'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/ktnef.man +++ kdepim-3.5.7enterprise20070810/debian/man/ktnef.man @@ -0,0 +1,21 @@ +.TH KTNEF 1 +.SH NAME +ktnef \- TNEF file viewer +.SH SYNOPSIS +.B ktnef +.I [Qt-options] [KDE-options] [file] +.SH DESCRIPTION +.B Ktnef +is an application for to view TNEF mail attachments. These attachments are +usually found in mails coming from Microsoft mail servers and embed the mail +properties as well as the actual attachments. +.SH PROGRAM OPTIONS +.TP +.B file +Attachment file to view. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/ktnef +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/ktnef'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/kontact.man +++ kdepim-3.5.7enterprise20070810/debian/man/kontact.man @@ -0,0 +1,32 @@ +.TH KONTACT 1 +.SH NAME +kontact \- Integrated KDE personal information management application +.SH SYNOPSIS +.B kontact +.I [Qt-options] [KDE-options] [options] +.SH DESCRIPTION +.B Kontact +is the integrated solution for personal information management. It combines +the well-known KDE applications for email, scheduling, address book, notes +and newsgroups (KMail, KOrganizer, KAddressBook, KNotes and KNode) into a +single interface. Being based on a true component framework Kontact provides +exactly the same functionality as the stand-alone applications, and adds +more features, by making use of the integrated way Kontact runs the +applications as components. Users still retain the choice of which +applications are run within Kontact and which are run stand-alone. +.SH PROGRAM OPTIONS +.TP +.B --module \fI\fB +Start with a specific Kontact module. +.TP +.B --nosplash +Disable the splash screen. +.TP +.B --list +List all possible modules and exit. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/kontact +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/kontact'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/kpilot.man +++ kdepim-3.5.7enterprise20070810/debian/man/kpilot.man @@ -0,0 +1,28 @@ +.TH KPILOT 1 +.SH NAME +kpilot \- Palm Pilot synchronization software for KDE +.SH SYNOPSIS +.B kpilot +.I [Qt-options] [KDE-options] [options] +.SH DESCRIPTION +.B KPilot +is an application that synchronizes a PalmPilot or similar device with +the KDE desktop, much like the Palm Desktop HotSync software does for +Windows. KPilot can backup, restore, and HotSync your PalmPilot. It can +synchronize the built-in applications with their KDE counterparts. It also +features additional conduits for third-party software. +.SH PROGRAM OPTIONS +.TP +.B -s, --setup +Setup the Pilot device, conduits and other parameters. +.TP +.B -c, --conduit-setup +Deprecated, use +.B --setup +instead. +.so kdeopt.part +.SH SEE ALSO +More detailed user documentation is available from +.BR help:/kpilot +(either enter this URL into \fBkonqueror\fP, or run `khelpcenter +help:/kpilot'). --- kdepim-3.5.7enterprise20070810.orig/debian/man/exchangewizard.man +++ kdepim-3.5.7enterprise20070810/debian/man/exchangewizard.man @@ -0,0 +1,15 @@ +.TH EXCHANGEWIZARD 1 +.SH NAME +exchangewizard \- MS Exchange Setup Wizard +.SH SYNOPSIS +.B exchangewizard +.I [Qt-options] [KDE-options] [options] +.SH DESCRIPTION +.B exchangewizard +is a front end to configure Microsoft Exchange servers. +.SH PROGRAM OPTIONS +.TP +.B --verbose +Enable verbose output. +.so kdeopt.part + --- kdepim-3.5.7enterprise20070810.orig/debian/man/kalarmd.man +++ kdepim-3.5.7enterprise20070810/debian/man/kalarmd.man @@ -0,0 +1,18 @@ +.TH KALARMD 1 +.SH NAME +kalarmd \- KDE alarm daemon +.SH SYNOPSIS +.B kalarmd +.I [Qt-options] [KDE-options] [options] +.SH DESCRIPTION +.B kalarmd +runs in the background and handles displaying the events scheduled by +\fBkalarm\fP. You should normally not have to run this daemon manually. +.SH PROGRAM OPTIONS +.TP +.B --autostart +Application is being auto-started at KDE session start. +.so kdeopt.part +.SH SEE ALSO +.B kalarm +(1). --- kdepim-3.5.7enterprise20070810.orig/debian/man/kalarm.man +++ kdepim-3.5.7enterprise20070810/debian/man/kalarm.man @@ -0,0 +1,132 @@ +.TH KALARM 1 +.SH NAME +kalarm \- Personal alarm message, command and email scheduler for KDE +.SH SYNOPSIS +.B kalarm +.I [Qt-options] [KDE-options] [options] [message] +.SH DESCRIPTION +\fBKAlarm\fP is a personal alarm message, command and email scheduler. It +lets you set up personal alarm messages which pop up on the screen at the +chosen time, or you can schedule commands to be executed or emails to be +sent. +.SH PROGRAM OPTIONS +.TP +.B -a, --ack-confirm +Prompt for confirmation when alarm is acknowledged. +.TP +.B -A, --attach \fI\fB +Attach file to email (repeat as needed). +.TP +.B --auto-close +Auto-close alarm window after --late-cancel period. +.TP +.B --bcc +Blind copy email to self. +.TP +.B -b, --beep +Beep when message is displayed. +.TP +.B -c, --color \fI\fB +Message background color (name or hex 0xRRGGBB). +.TP +.B -C, --colorfg \fI\fB +Message foreground color (name or hex 0xRRGGBB). +.TP +.B --calendarURL \fI\fB +URL of calendar file. +.TP +.B --cancelEvent \fI\fB +Cancel alarm with the specified event ID. +.TP +.B -d, --disable +Disable the alarm. +.TP +.B -e, --exec \fI\fB +Execute a shell command line. +.TP +.B --edit \fI\fB +Display the alarm edit dialog to edit the specified alarm. +.TP +.B -n, --edit-new +Display the alarm edit dialog to edit a new alarm. +.TP +.B --edit-new-preset \fI\fB +Display the alarm edit dialog, preset with a template. +.TP +.B -f, --file \fI\fB +File to display. +.TP +.B -F, --from-id \fI\fB +KMail identity to use as sender of email. +.TP +.B --handleEvent \fI\fB +Trigger or cancel alarm with the specified event ID. +.TP +.B -i, --interval \fI\fB +Interval between alarm repetitions. +.TP +.B -k, --korganizer +Show alarm as an event in KOrganizer. +.TP +.B -l, --late-cancel \fI\fB +Cancel alarm if more than 'period' late when triggered. +.TP +.B -L, --login +Repeat alarm at every login. +.TP +.B -m, --mail \fI
\fB +Send an email to the given address (repeat as needed). +.TP +.B -p, --play \fI\fB +Audio file to play once. +.TP +.B -P, --play-repeat \fI\fB +Audio file to play repeatedly. +.TP +.B --recurrence \fI\fB +Specify alarm recurrence using iCalendar syntax. +.TP +.B -R, --reminder \fI\fB +Display reminder in advance of alarm. +.TP +.B --reminder-once \fI\fB +Display reminder once, before first alarm recurrence. +.TP +.B -r, --repeat \fI\fB +Number of times to repeat alarm (including initial occasion). +.TP +.B --reset +Reset the alarm scheduling daemon. +.TP +.B -s, --speak +Speak the message when it is displayed. +.TP +.B --stop +Stop the alarm scheduling daemon. +.TP +.B -S, --subject +Email subject line. +.TP +.B -t, --time \fI