Hello community,
here is the log from the commit of package kdepim3
checked in at Mon Aug 6 22:42:53 CEST 2007.
--------
--- KDE/kdepim3/kdepim3.changes 2007-08-04 19:48:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-08-06 22:29:02.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 6 18:00:00 CEST 2007 - wstephenson@suse.de
+
+- Using kdepim's enterprise branch source tarballs.
+ This brings stability and increased QA.
+- Build kitchensync in-tree, due to PIM dependency
+
+-------------------------------------------------------------------
Old:
----
3_5_BRANCH.diff
FIXME.diff
kdepim-3.5.7.tar.bz2
kmail_remember_dimap_deletions.diff
kmail_unread_new_important.diff
remove_deletefolder.diff
New:
----
ENTERPRISE_BRANCH.diff
kdepim_3.5.6.enterprise.0.20070731.694771.orig.tar.bz2
kitchensync.diff
kitchensync-opensuse.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.j16328/_old 2007-08-06 22:39:17.000000000 +0200
+++ /var/tmp/diff_new_pack.j16328/_new 2007-08-06 22:39:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepim3 (Version 3.5.7)
+# spec file for package kdepim3 (Version 3.5.7.enterprise.0.20070731.694771)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: kdepim3
-BuildRequires: cyrus-sasl-devel flex hal-devel kdelibs3-devel libmal-devel python-devel
+BuildRequires: cyrus-sasl-devel flex hal-devel kdelibs3-devel libmal-devel libopensync-devel python-devel
%if 0%{?sles_version}
%else
BuildRequires: gnokii-devel
@@ -27,34 +27,32 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: Personal Information Manager Software for KDE
-Version: 3.5.7
-Release: 29
+Version: 3.5.7.enterprise.0.20070731.694771
+Release: 1
+%define realversion 3.5.6.enterprise.0.20070731.694771
URL: http://www.kde.org/
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
Provides: kdenetwork3-mail kdepim3-organizer akregator
Obsoletes: kdenetwork3-mail kdepim3-organizer akregator
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: kdepim-%{version}.tar.bz2
+Source0: kdepim_%{realversion}.orig.tar.bz2
Source5: groupwarewizard.desktop
-Patch0: 3_5_BRANCH.diff
+Patch0: ENTERPRISE_BRANCH.diff
Patch1: install-headers.diff
+Patch2: kitchensync.diff
Patch5: kdepim_networkstatus_branch.diff
Patch7: fix-artwork.diff
Patch10: start-kpilot-instead-complain.diff
Patch16: fix_designer_path.diff
Patch17: knode_threaded_crash.diff
Patch20: no-final.diff
-Patch22: kmail_unread_new_important.diff
+#Patch22: kmail_unread_new_important.diff
Patch23: kmail-avoid-crash-on-startup.diff
Patch24: kmail_attachment_size.diff
Patch25: kmail-crash.diff
Patch28: kmail_allow_tls_login_auth.diff
-#probably going into 3_5_branch soon
-Patch29: kmail_remember_dimap_deletions.diff
-Patch30: FIXME.diff
-# Removes the 'delete folder' action from the context menu
-Patch31: remove_deletefolder.diff
+Patch101: kitchensync-opensuse.diff
Provides: cryptplug
Obsoletes: cryptplug
%if %suse_version > 1000
@@ -170,27 +168,48 @@
--------
The KDE Team
+%package -n kitchensync
+Summary: KDE Synchronization application based on OpenSync.
+Group: Hardware/PDA
+Version: 0.01svn691344
+Release: 1
+Provides: kdepim3-sync
+Obsoletes: kdepim3-sync
+Requires: libopensync1 >= 0.31
+Requires: kdepim3
+
+%description -n kitchensync
+KitchenSync is a Synchronization application based on OpenSync. With
+KitchenSync you are able to synchronize cell phones, organizer, palms
+and other Personal Information Manager with KDE PIM (KAddressbook,
+KOrganizer, KNotes).
+
+
+
+Authors:
+--------
+ Tobias Koenig
+ Cornelius Schumacher activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
-@@ -932,11 +935,13 @@
+@@ -934,11 +937,13 @@
KPIM::BroadcastStatus::instance()->setStatusMsg(
i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else {
@@ -75,10 +75,34 @@
}
else { // i.e. we have a chance to continue, ask the user about it
if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
+Index: kmail/kmmainwin.h
+===================================================================
+--- kmail/kmmainwin.h (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/kmmainwin.h (.../work/~wstephens/kdepim) (revision 696922)
+@@ -29,6 +29,7 @@
+ class StatusbarProgressWidget;
+ class ProgressDialog;
+ }
++
+ using KPIM::StatusbarProgressWidget;
+ using KPIM::ProgressDialog;
+
+Index: kmail/Makefile.am
+===================================================================
+--- kmail/Makefile.am (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/Makefile.am (.../work/~wstephens/kdepim) (revision 696922)
+@@ -31,6 +31,7 @@
+ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
+ ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
+ ../libkcal/libkcal.la \
++ -lconnectionmanager \
+ $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
+
+ kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
Index: kmail/kmkernel.cpp
===================================================================
---- kmail/kmkernel.cpp (.../KDE/3.5/kdepim) (revision 667288)
-+++ kmail/kmkernel.cpp (.../work/~wstephens/kdepim) (revision 667288)
+--- kmail/kmkernel.cpp (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/kmkernel.cpp (.../work/~wstephens/kdepim) (revision 696922)
@@ -28,6 +28,7 @@
#undef REALLY_WANT_KMSENDER
#include "undostack.h"
@@ -131,7 +155,7 @@
}
bool KMKernel::askToGoOnline()
-@@ -1474,6 +1479,8 @@
+@@ -1477,6 +1482,8 @@
if (lsf)
the_searchFolderMgr->remove( lsf );
@@ -140,7 +164,7 @@
the_acctMgr = new AccountManager();
the_filterMgr = new KMFilterMgr();
the_popFilterMgr = new KMFilterMgr(true);
-@@ -1528,6 +1535,12 @@
+@@ -1529,6 +1536,12 @@
#else
mBackgroundTasksTimer->start( 5 * 60000, true ); // 5 minutes, singleshot
#endif
@@ -155,9 +179,9 @@
void KMKernel::readConfig()
Index: kmail/popaccount.cpp
===================================================================
---- kmail/popaccount.cpp (.../KDE/3.5/kdepim) (revision 667288)
-+++ kmail/popaccount.cpp (.../work/~wstephens/kdepim) (revision 667288)
-@@ -1015,7 +1015,9 @@
+--- kmail/popaccount.cpp (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/popaccount.cpp (.../work/~wstephens/kdepim) (revision 696922)
+@@ -1016,7 +1016,9 @@
}
if (interactive) {
@@ -170,8 +194,8 @@
Index: kmail/accountmanager.cpp
===================================================================
---- kmail/accountmanager.cpp (.../KDE/3.5/kdepim) (revision 667288)
-+++ kmail/accountmanager.cpp (.../work/~wstephens/kdepim) (revision 667288)
+--- kmail/accountmanager.cpp (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/accountmanager.cpp (.../work/~wstephens/kdepim) (revision 696922)
@@ -22,6 +22,7 @@
#include
#include
@@ -198,8 +222,8 @@
Index: kmail/kmkernel.h
===================================================================
---- kmail/kmkernel.h (.../KDE/3.5/kdepim) (revision 667288)
-+++ kmail/kmkernel.h (.../work/~wstephens/kdepim) (revision 667288)
+--- kmail/kmkernel.h (.../KDE/3.5/kdepim) (revision 696107)
++++ kmail/kmkernel.h (.../work/~wstephens/kdepim) (revision 696922)
@@ -202,18 +202,6 @@
*/
virtual void resumeBackgroundJobs();
@@ -238,16 +262,3 @@
protected slots:
void slotDataReq(KIO::Job*,QByteArray&);
void slotResult(KIO::Job*);
-
-Index: kmail/Makefile.am
-===================================================================
---- kmail/Makefile.am (revision 663156)
-+++ kmail/Makefile.am (working copy)
-@@ -31,6 +31,7 @@ libkmailprivate_la_LIBADD = \
- ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
- ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
- ../libkcal/libkcal.la \
-+ -lconnectionmanager \
- $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
-
- kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
++++++ kitchensync.diff ++++++
++++ 4373 lines (skipped)
++++++ kitchensync-opensuse.diff ++++++
Index: kitchensync/src/aboutpage.cpp
================================================================================
--- kitchensync/src/aboutpage.cpp
+++ kitchensync/src/aboutpage.cpp
@@ -98,7 +98,8 @@
int iconSize = iconloader->currentSize( KIcon::Desktop );
QString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop );
- QString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
+// QString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop );
+ QString html_icon_path = iconloader->iconPath( "suse", KIcon::Desktop );
QString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop );
QString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</h2>"
@@ -108,24 +109,15 @@
"<td>%1</a><br><nobr>%1</td></tr>"
"<tr><td></a></td>"
"<td>%1</a><br><nobr>%1</td></tr>"
- "<tr><td></a></td>"
- "<td>%1</a><br><nobr>%1</td></tr>"
"</table>" )
.arg( kapp->aboutData()->version() )
- .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) )
- .arg( "help:/kitchensync" )
- .arg( iconSize )
- .arg( iconSize )
- .arg( handbook_icon_path )
- .arg( "help:/kitchensync" )
- .arg( i18n( "Read Manual" ) )
- .arg( i18n( "Learn more about KitchenSync and its components" ) )
- .arg( "http://pim.kde.org" )
+ .arg( i18n( "KitchenSync synchronizes your addressbook, calendar, to-do list and more." ) )
+ .arg( "http://en.opensuse.org/OpenSync" )
.arg( iconSize )
.arg( iconSize )
.arg( html_icon_path )
- .arg( "http://pim.kde.org" )
- .arg( i18n( "Visit KitchenSync Website" ) )
+ .arg( "http://en.opensuse.org/OpenSync" )
+ .arg( i18n( "Visit OpenSync Wiki on openSUSE" ) )
.arg( i18n( "Access online resources and tutorials" ) )
.arg( "exec:/addGroup" )
.arg( iconSize )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org