rpms/kdepim/devel kdepim-3.5.9-opensync03.patch, 1.1, 1.2 kdepim.spec, 1.155, 1.156
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri Feb 15 06:04:26 UTC 2008
- Previous message (by thread): rpms/kdepim/devel kdepim-3.5.9-opensync03.patch, NONE, 1.1 kdepim.spec, 1.154, 1.155
- Next message (by thread): rpms/kdegames3/devel kdegames-3.5.9-trademarks.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdegames3.spec, 1.4, 1.5 sources, 1.2, 1.3 kdegames-3.5.8-trademarks.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32166/devel
Modified Files:
kdepim-3.5.9-opensync03.patch kdepim.spec
Log Message:
Take the diff from tags/KDE/3.5.9 as I had intended (doesn't seem to make any actual difference, but...).
kdepim-3.5.9-opensync03.patch:
Index: kdepim-3.5.9-opensync03.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim-3.5.9-opensync03.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-3.5.9-opensync03.patch 15 Feb 2008 05:51:37 -0000 1.1
+++ kdepim-3.5.9-opensync03.patch 15 Feb 2008 06:04:22 -0000 1.2
@@ -1,7 +1,7 @@
Index: libqopensync/environment.cpp
===================================================================
---- libqopensync/environment.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/environment.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/environment.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/environment.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,172 +0,0 @@
-/*
- This file is part of libqopensync.
@@ -177,8 +177,8 @@
-}
Index: libqopensync/environment.h
===================================================================
---- libqopensync/environment.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/environment.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/environment.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/environment.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,199 +0,0 @@
-/*
- This file is part of libqopensync.
@@ -381,8 +381,8 @@
-#endif
Index: libqopensync/plugin.cpp
===================================================================
---- libqopensync/plugin.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/plugin.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/plugin.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/plugin.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,6 +20,7 @@
*/
@@ -393,8 +393,8 @@
Index: libqopensync/callbackhandler.h
===================================================================
---- libqopensync/callbackhandler.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/callbackhandler.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/callbackhandler.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/callbackhandler.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -76,10 +76,10 @@
class EngineEvent;
class MemberEvent;
@@ -411,8 +411,8 @@
Engine* mEngine;
Index: libqopensync/group.h
===================================================================
---- libqopensync/group.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/group.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/group.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/group.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -25,35 +25,22 @@
#include <qdatetime.h>
#include <qstringlist.h>
@@ -573,8 +573,8 @@
};
Index: libqopensync/syncupdates.cpp
===================================================================
---- libqopensync/syncupdates.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncupdates.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncupdates.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncupdates.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -19,7 +19,8 @@
Boston, MA 02110-1301, USA.
*/
@@ -760,8 +760,8 @@
if ( update->error )
Index: libqopensync/plugin.h
===================================================================
---- libqopensync/plugin.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/plugin.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/plugin.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/plugin.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -30,7 +30,7 @@
class Plugin
@@ -773,8 +773,8 @@
public:
Index: libqopensync/groupenv.cpp
===================================================================
---- libqopensync/groupenv.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ libqopensync/groupenv.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/groupenv.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ libqopensync/groupenv.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,121 @@
+/*
+ This file is part of libqopensync.
@@ -899,8 +899,8 @@
+}
Index: libqopensync/engine.cpp
===================================================================
---- libqopensync/engine.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/engine.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/engine.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/engine.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,8 +20,12 @@
*/
@@ -985,8 +985,8 @@
+
Index: libqopensync/member.cpp
===================================================================
---- libqopensync/member.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/member.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/member.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/member.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,8 +20,12 @@
*/
@@ -1124,8 +1124,8 @@
-}
Index: libqopensync/pluginenv.cpp
===================================================================
---- libqopensync/pluginenv.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ libqopensync/pluginenv.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/pluginenv.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ libqopensync/pluginenv.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,96 @@
+/*
+ This file is part of libqopensync.
@@ -1225,8 +1225,8 @@
+*/
Index: libqopensync/syncupdates.h
===================================================================
---- libqopensync/syncupdates.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncupdates.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncupdates.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncupdates.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -42,14 +42,12 @@
public:
enum Type {
@@ -1314,8 +1314,8 @@
SyncEngineUpdate();
Index: libqopensync/groupenv.h
===================================================================
---- libqopensync/groupenv.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ libqopensync/groupenv.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/groupenv.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ libqopensync/groupenv.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,86 @@
+/*
+ This file is part of libqopensync.
@@ -1405,8 +1405,8 @@
+#endif
Index: libqopensync/engine.h
===================================================================
---- libqopensync/engine.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/engine.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/engine.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/engine.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -22,12 +22,14 @@
#ifndef QSYNC_ENGINE_H
#define QSYNC_ENGINE_H
@@ -1438,8 +1438,8 @@
void abort();
Index: libqopensync/member.h
===================================================================
---- libqopensync/member.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/member.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/member.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/member.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -22,19 +22,21 @@
#ifndef QSYNC_MEMBER_H
#define QSYNC_MEMBER_H
@@ -1501,8 +1501,8 @@
};
Index: libqopensync/pluginenv.h
===================================================================
---- libqopensync/pluginenv.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ libqopensync/pluginenv.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/pluginenv.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ libqopensync/pluginenv.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,80 @@
+/*
+ This file is part of libqopensync.
@@ -1586,8 +1586,8 @@
+#endif
Index: libqopensync/result.cpp
===================================================================
---- libqopensync/result.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/result.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/result.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/result.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -100,7 +100,7 @@
mMessage = QString::fromUtf8( osync_error_print( error ) );
@@ -1599,8 +1599,8 @@
Result::~Result()
Index: libqopensync/syncchange.cpp
===================================================================
---- libqopensync/syncchange.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncchange.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncchange.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncchange.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -19,8 +19,13 @@
Boston, MA 02110-1301, USA.
*/
@@ -1734,8 +1734,8 @@
break;
Index: libqopensync/filter.cpp
===================================================================
---- libqopensync/filter.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/filter.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/filter.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/filter.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,6 +20,7 @@
*/
@@ -1746,8 +1746,8 @@
Index: libqopensync/conversion.cpp
===================================================================
---- libqopensync/conversion.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/conversion.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/conversion.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/conversion.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,6 +20,7 @@
*/
@@ -1785,8 +1785,8 @@
}
Index: libqopensync/syncchange.h
===================================================================
---- libqopensync/syncchange.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncchange.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncchange.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncchange.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -25,6 +25,7 @@
#include <libqopensync/member.h>
@@ -1815,8 +1815,8 @@
Sets the change type.
Index: libqopensync/Makefile.am
===================================================================
---- libqopensync/Makefile.am (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/Makefile.am (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/Makefile.am (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/Makefile.am (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -2,17 +2,21 @@
-I$(top_srcdir)/kitchensync \
-I$(top_srcdir) \
@@ -1845,8 +1845,8 @@
messages: rc.cpp
Index: libqopensync/syncmapping.cpp
===================================================================
---- libqopensync/syncmapping.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncmapping.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncmapping.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncmapping.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -20,19 +20,20 @@
*/
@@ -1953,8 +1953,8 @@
}
Index: libqopensync/conversion.h
===================================================================
---- libqopensync/conversion.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/conversion.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/conversion.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/conversion.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -24,13 +24,13 @@
#include <qstringlist.h>
@@ -1982,8 +1982,8 @@
}
Index: libqopensync/callbackhandler.cpp
===================================================================
---- libqopensync/callbackhandler.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/callbackhandler.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/callbackhandler.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/callbackhandler.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -19,12 +19,13 @@
Boston, MA 02110-1301, USA.
*/
@@ -2047,8 +2047,8 @@
Index: libqopensync/group.cpp
===================================================================
---- libqopensync/group.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/group.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/group.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/group.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -25,86 +25,18 @@
/** hack includes **/
@@ -2245,8 +2245,8 @@
}
Index: libqopensync/syncmapping.h
===================================================================
---- libqopensync/syncmapping.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ libqopensync/syncmapping.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- libqopensync/syncmapping.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ libqopensync/syncmapping.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -25,7 +25,7 @@
#include <libqopensync/syncchange.h>
@@ -2276,8 +2276,8 @@
}
Index: src/xmldiffalgo.h
===================================================================
---- src/xmldiffalgo.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ src/xmldiffalgo.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/xmldiffalgo.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ src/xmldiffalgo.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,54 @@
+/*
+ This file is part of KitchenSync
@@ -2335,8 +2335,8 @@
+#endif
Index: src/syncprocess.h
===================================================================
---- src/syncprocess.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/syncprocess.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/syncprocess.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/syncprocess.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -44,12 +44,10 @@
QString memberStatus( const QSync::Member &member ) const;
@@ -2353,8 +2353,8 @@
This signal is emitted whenever the engine has changed ( reinitialized ).
Index: src/singleconflictdialog.cpp
===================================================================
---- src/singleconflictdialog.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/singleconflictdialog.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/singleconflictdialog.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/singleconflictdialog.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -27,6 +27,7 @@
#include "addresseediffalgo.h"
@@ -2399,8 +2399,8 @@
layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
Index: src/configguisyncmlhttp.cpp
===================================================================
---- src/configguisyncmlhttp.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/configguisyncmlhttp.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/configguisyncmlhttp.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/configguisyncmlhttp.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -121,7 +121,7 @@
mGridLayout->addWidget( label, 5, 0 );
@@ -2421,8 +2421,8 @@
Index: src/groupconfigdialog.cpp
===================================================================
---- src/groupconfigdialog.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfigdialog.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfigdialog.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfigdialog.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -28,7 +28,7 @@
GroupConfigDialog::GroupConfigDialog( QWidget *parent, SyncProcess *process )
@@ -2468,8 +2468,8 @@
#include "groupconfigdialog.moc"
Index: src/memberconfig.h
===================================================================
---- src/memberconfig.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/memberconfig.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/memberconfig.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/memberconfig.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -38,6 +38,8 @@
void loadData();
void saveData();
@@ -2481,8 +2481,8 @@
Index: src/syncprocessmanager.cpp
===================================================================
---- src/syncprocessmanager.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/syncprocessmanager.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/syncprocessmanager.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/syncprocessmanager.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -23,7 +23,10 @@
#include "syncprocess.h"
@@ -2596,8 +2596,8 @@
#include "syncprocessmanager.moc"
Index: src/configguifile.cpp
===================================================================
---- src/configguifile.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/configguifile.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/configguifile.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/configguifile.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -55,13 +55,20 @@
QDomDocument doc;
doc.setContent( xml );
@@ -2654,8 +2654,8 @@
}
Index: src/syncprocess.cpp
===================================================================
---- src/syncprocess.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/syncprocess.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/syncprocess.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/syncprocess.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -19,10 +19,12 @@
*/
@@ -2735,8 +2735,8 @@
#include "syncprocess.moc"
Index: src/groupconfig.cpp
===================================================================
---- src/groupconfig.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfig.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfig.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfig.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -27,8 +27,10 @@
#include "syncprocess.h"
#include "syncprocessmanager.h"
@@ -2868,8 +2868,8 @@
#include "groupconfig.moc"
Index: src/memberconfig.cpp
===================================================================
---- src/memberconfig.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/memberconfig.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/memberconfig.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/memberconfig.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -23,6 +23,8 @@
#include "configgui.h"
#include "memberinfo.h"
@@ -2901,8 +2901,8 @@
#include "memberconfig.moc"
Index: src/groupconfigcommon.h
===================================================================
---- src/groupconfigcommon.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfigcommon.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfigcommon.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfigcommon.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -30,6 +30,8 @@
class SyncProcess;
class QCheckBox;
@@ -2931,8 +2931,8 @@
};
Index: src/groupconfigdialog.h
===================================================================
---- src/groupconfigdialog.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfigdialog.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfigdialog.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfigdialog.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -35,7 +35,12 @@
protected slots:
@@ -2948,8 +2948,8 @@
};
Index: src/syncprocessmanager.h
===================================================================
---- src/syncprocessmanager.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/syncprocessmanager.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/syncprocessmanager.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/syncprocessmanager.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -26,7 +26,8 @@
#include <libqopensync/group.h>
@@ -3008,8 +3008,8 @@
};
Index: src/configguisyncmlobex.cpp
===================================================================
---- src/configguisyncmlobex.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/configguisyncmlobex.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/configguisyncmlobex.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/configguisyncmlobex.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -153,7 +153,7 @@
mGridLayout->addWidget( label, 14, 0 );
@@ -3030,8 +3030,8 @@
Index: src/groupconfig.h
===================================================================
---- src/groupconfig.h (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfig.h (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfig.h (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfig.h (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -40,12 +40,19 @@
void setSyncProcess( SyncProcess *process );
@@ -3067,8 +3067,8 @@
#endif
Index: src/mainwidget.cpp
===================================================================
---- src/mainwidget.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/mainwidget.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/mainwidget.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/mainwidget.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -26,7 +26,7 @@
#include "syncprocess.h"
#include "syncprocessmanager.h"
@@ -3116,8 +3116,8 @@
}
Index: src/groupconfigcommon.cpp
===================================================================
---- src/groupconfigcommon.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupconfigcommon.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupconfigcommon.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupconfigcommon.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -30,14 +30,15 @@
#include <qcheckbox.h>
@@ -3179,8 +3179,8 @@
}
Index: src/xmldiffalgo.cpp
===================================================================
---- src/xmldiffalgo.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 0)
-+++ src/xmldiffalgo.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/xmldiffalgo.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 0)
++++ src/xmldiffalgo.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -0,0 +1,166 @@
+/*
+ This file is part of KitchenSync.
@@ -3350,8 +3350,8 @@
+
Index: src/kitchensync.desktop
===================================================================
---- src/kitchensync.desktop (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/kitchensync.desktop (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/kitchensync.desktop (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/kitchensync.desktop (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -2,6 +2,7 @@
Encoding=UTF-8
Name=KitchenSync
@@ -3378,8 +3378,8 @@
Type=Application
Index: src/groupitem.cpp
===================================================================
---- src/groupitem.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/groupitem.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/groupitem.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/groupitem.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -33,6 +33,9 @@
#include <qprogressbar.h>
#include <qvbox.h>
@@ -3545,8 +3545,8 @@
void MemberItem::setStatusMessage( const QString &msg )
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/Makefile.am (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/Makefile.am (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/Makefile.am (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -24,7 +24,7 @@
pluginpicker.cpp configgui.cpp configguiblank.cpp configguifile.cpp \
memberinfo.cpp groupconfigcommon.cpp kwidgetlist.cpp \
@@ -3558,8 +3558,8 @@
configguisyncmlobex.cpp configguisyncmlhttp.cpp configguiopie.cpp \
Index: src/multiconflictdialog.cpp
===================================================================
---- src/multiconflictdialog.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/multiconflictdialog.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/multiconflictdialog.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/multiconflictdialog.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -39,8 +39,10 @@
{
QGridLayout *layout = new QGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
@@ -3575,8 +3575,8 @@
switch ( change.changeType() ) {
Index: src/pluginpicker.cpp
===================================================================
---- src/pluginpicker.cpp (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ src/pluginpicker.cpp (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- src/pluginpicker.cpp (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ src/pluginpicker.cpp (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -24,7 +24,7 @@
#include "memberinfo.h"
#include "syncprocessmanager.h"
@@ -3608,8 +3608,8 @@
Index: configure.in.bot
===================================================================
---- configure.in.bot (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ configure.in.bot (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- configure.in.bot (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ configure.in.bot (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -1,7 +1,7 @@
-if test "$HAVE_OPENSYNC" = 0 -o "$HAVE_OPENSYNC_ENGINE" = 0; then
+if test "$HAVE_OPENSYNC" = 0; then
@@ -3622,8 +3622,8 @@
all_tests=bad
Index: configure.in.in
===================================================================
---- configure.in.in (.../kdepim/enterprise/kdepim/kitchensync) (revision 774532)
-+++ configure.in.in (.../work/kitchensync-OpenSync0.30API) (revision 774532)
+--- configure.in.in (.../tags/KDE/3.5.9/kdepim/kitchensync) (revision 774532)
++++ configure.in.in (.../branches/work/kitchensync-OpenSync0.30API) (revision 774532)
@@ -29,9 +29,7 @@
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kdepim.spec 15 Feb 2008 05:51:37 -0000 1.155
+++ kdepim.spec 15 Feb 2008 06:04:22 -0000 1.156
@@ -48,7 +48,7 @@
Patch1: kdepim-3.4.0-kandy-icons.patch
Patch2: kdepim-xdg_open.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/branches/kdepim/enterprise/kdepim/kitchensync@774532 \
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \
# svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API@774532 >kdepim-3.5.9-opensync03.patch
Patch3: kdepim-3.5.9-opensync03.patch
- Previous message (by thread): rpms/kdepim/devel kdepim-3.5.9-opensync03.patch, NONE, 1.1 kdepim.spec, 1.154, 1.155
- Next message (by thread): rpms/kdegames3/devel kdegames-3.5.9-trademarks.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdegames3.spec, 1.4, 1.5 sources, 1.2, 1.3 kdegames-3.5.8-trademarks.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list