rev 13609 - in branches/kde4.2/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-01-27 08:22:48 +0000 (Tue, 27 Jan 2009)
New Revision: 13609

Added:
   branches/kde4.2/packages/kdepim/debian/patches/01_r914705_to_r915907_kpilot_branch_fixes.diff
Removed:
   branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff
Modified:
   branches/kde4.2/packages/kdepim/debian/control
   branches/kde4.2/packages/kdepim/debian/patches/series
Log:
add akonadi dependencies and finally fix kpilot - release now

Modified: branches/kde4.2/packages/kdepim/debian/control
===================================================================
--- branches/kde4.2/packages/kdepim/debian/control	2009-01-27 08:18:37 UTC (rev 13608)
+++ branches/kde4.2/packages/kdepim/debian/control	2009-01-27 08:22:48 UTC (rev 13609)
@@ -99,7 +99,7 @@
 Package: kaddressbook
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, akonadi-server (>= 1.1.1)
 Suggests: kdepim-kresources
 Replaces: korganizer (<< 4:4.1.80), kontact (<< 4:4.1.80)
 Description: KDE address book
@@ -322,7 +322,7 @@
 Package: korganizer
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends},  akonadi-server (>= 1.1.1 )
 Homepage: http://kontact.kde.org/korganizer/
 Replaces: kaddressbook (<< 4:4.1.80), kontact (<< 4:4.1.80)
 Description: KDE personal organizer
@@ -358,7 +358,7 @@
 Package: kpilot
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, akonadi-server (>= 1.1.1) 
 Suggests: knotes, korganizer
 Homepage: http://cvs.codeyard.net/kpilot/
 Description: KDE Palm Pilot hot-sync tool

Deleted: branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff

Added: branches/kde4.2/packages/kdepim/debian/patches/01_r914705_to_r915907_kpilot_branch_fixes.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/01_r914705_to_r915907_kpilot_branch_fixes.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/01_r914705_to_r915907_kpilot_branch_fixes.diff	2009-01-27 08:22:48 UTC (rev 13609)
@@ -0,0 +1,89 @@
+Index: kdepim/kpilot/conduits/akonadibase/akonadidataproxy.cc
+===================================================================
+--- kdepim/kpilot/conduits/akonadibase/akonadidataproxy.cc	(revision 914705)
++++ kdepim/kpilot/conduits/akonadibase/akonadidataproxy.cc	(revision 915907)
+@@ -136,6 +136,7 @@
+ 				// Well the record with id mPcId doesn't seem to be in the akonadi
+ 				// resource any more so it is deleted.
+ 				AkonadiRecord* ar = createDeletedAkonadiRecord( mPcId );
++				ar->setDummy();
+ 				Q_ASSERT( ar->isDeleted() );
+ 				Q_ASSERT( ar->isModified() );
+ 				Q_ASSERT( ar->id() == mPcId );
+Index: kdepim/kpilot/conduits/akonadibase/akonadirecord.cc
+===================================================================
+--- kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 914705)
++++ kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 915907)
+@@ -47,8 +47,13 @@
+ 	d->fItem = item;
+ 	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
+ 	d->fDeleted = false;
++	d->fDummy = false;
+ }
+ 
++/**
++ * This ctor is _only_ used for dummy records which are temporarily used to delete
++ * data.
++ */
+ AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
+ {
+ 	d->fTempId = id;
+@@ -122,6 +127,11 @@
+ 	d->fItem = item;
+ 	// Make sure that we return the right id after updating the itemobject.
+ 	setId( QString::number( item.id() ) );
++	/**
++	 * Assuming we're being passed a valid item to use, make sure fDummy
++	 * is not still false after this.
++	 */
++	setDummy( false );
+ }
+ 
+ void AkonadiRecord::synced()
+@@ -130,9 +140,17 @@
+ 	// Nothing to do here.
+ }
+ 
++void AkonadiRecord::setDummy(bool dummy)
++{
++	FUNCTIONSETUPL(5);
++	DEBUGKPILOT << "dummy: " << dummy;
++	d->fDummy = dummy;
++}
++
+ bool AkonadiRecord::isValid() const
+ {
+ 	FUNCTIONSETUPL(5);
+ 	bool valid = ! d->fDummy;
++	DEBUGKPILOT << "valid: " << valid;
+ 	return valid;
+ }
+Index: kdepim/kpilot/conduits/akonadibase/akonadirecord.h
+===================================================================
+--- kdepim/kpilot/conduits/akonadibase/akonadirecord.h	(revision 914705)
++++ kdepim/kpilot/conduits/akonadibase/akonadirecord.h	(revision 915907)
+@@ -103,6 +103,12 @@
+ 	 */
+ 	/* virtual */ bool isValid() const;
+ 
++	/**
++	  * Explicit set of whether this is a dummy (intended only for delete)
++	  * record.
++	  */
++	void setDummy( bool dummy = true );
++
+ private:
+ 	QSharedDataPointer<AkonadiRecordPrivate> d;
+ };
+Index: kdepim/kpilot/conduits/todo/todoconduit.cc
+===================================================================
+--- kdepim/kpilot/conduits/todo/todoconduit.cc	(revision 914705)
++++ kdepim/kpilot/conduits/todo/todoconduit.cc	(revision 915907)
+@@ -68,6 +68,7 @@
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()

Modified: branches/kde4.2/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/series	2009-01-27 08:18:37 UTC (rev 13608)
+++ branches/kde4.2/packages/kdepim/debian/patches/series	2009-01-27 08:22:48 UTC (rev 13609)
@@ -1,2 +1,2 @@
-01_915830_915907_kpilot_branch_fixes.diff
+01_r914705_to_r915907_kpilot_branch_fixes.diff
 30_debianize_akregator_default.diff