Merged revisions 1062618,1062981,1062989,1063097,1063174,1063192,1063196 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1062618 | cgiboudeaux | 2009-12-15 12:15:52 +0100 (Tue, 15 Dec 2009) | 14 lines
  
  Add a new option for KDE 4.4: KDEPIM_BUILD_NEPOMUK_AGENTS. It is enabled by default.
  Having soprano and nepomuk optional in kdelibs has some nasty effects on the kdepim applications,
  particularly KAdressbook which looses some important features.
  
  So, if this option is not explicitly disabled when building kdepim and kdepim-runtime, CMake will require:
  * Shared Desktop Ontologies >= 0.2
  * Soprano >= 2.3.70
  * Nepomuk
  
  Please keep in mind that kdepim will require these packages in KDE SC 4.5.
  
  CCMAIL: kde-pim@kde.org
................
  r1062981 | tmcguire | 2009-12-16 16:19:43 +0100 (Wed, 16 Dec 2009) | 161 lines
  
  Block release stuff, blocks, empty commits, etc
  SVN_MERGE
  SVN_SILENT
  Blocked revisions 1058385-1058386,1058414,1058474,1059846,1060278,1060307,1060333,1060717,1061368,1061421,1061432,1061443,1062371,1062467,1062635 via svnmerge
  
  ................
    r1058385 | tmcguire | 2009-12-04 12:36:34 +0100 (Fri, 04 Dec 2009) | 2 lines
    
    Update Newslog.txt
  ................
    r1058386 | tmcguire | 2009-12-04 12:37:20 +0100 (Fri, 04 Dec 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1058414 | winterz | 2009-12-04 13:26:06 +0100 (Fri, 04 Dec 2009) | 12 lines
    
    Blocked revisions 1058383,1058388 via svnmerge
    
    ........
      r1058383 | tmcguire | 2009-12-04 06:31:24 -0500 (Fri, 04 Dec 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1058388 | tmcguire | 2009-12-04 06:37:34 -0500 (Fri, 04 Dec 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1058474 | winterz | 2009-12-04 15:30:11 +0100 (Fri, 04 Dec 2009) | 12 lines
    
    Merged revisions 1058462 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1058462 | winterz | 2009-12-04 09:11:35 -0500 (Fri, 04 Dec 2009) | 6 lines
      
      introduce new Calendar::sortEventsForDate() that properly handles
      sorting recurring events too.
      kolab/issue3972
      MERGE: e4,4.5 (add @since 4.5)
    ........
  ................
    r1059846 | winterz | 2009-12-07 15:42:28 +0100 (Mon, 07 Dec 2009) | 8 lines
    
    Blocked revisions 1059804 via svnmerge
    
    ........
      r1059804 | ludwigreiter | 2009-12-07 06:36:56 -0500 (Mon, 07 Dec 2009) | 2 lines
      
      Update after test of 2009-12-04 part.
    ........
  ................
    r1060278 | winterz | 2009-12-08 13:59:21 +0100 (Tue, 08 Dec 2009) | 3 lines
    
    stop using Soprano and Nepomuk -- at least for now.
    Soprano is a moving target
  ................
    r1060307 | winterz | 2009-12-08 15:46:09 +0100 (Tue, 08 Dec 2009) | 10 lines
    
    Merged revisions 1060303 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1060303 | winterz | 2009-12-08 09:40:11 -0500 (Tue, 08 Dec 2009) | 3 lines
      
      put a crash guard for the Observer in updated()
      MERGE: e4 (already in trunk)
    ........
  ................
    r1060333 | winterz | 2009-12-08 16:33:44 +0100 (Tue, 08 Dec 2009) | 11 lines
    
    Merged revisions 1059927 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1059927 | winterz | 2009-12-07 12:44:27 -0500 (Mon, 07 Dec 2009) | 4 lines
      
      let the addressee know their role in the invitation
      part of the fix for kolab/issue3964
      MERGE: e4,4.5 (new i18n strings)
    ........
  ................
    r1060717 | winterz | 2009-12-09 19:39:20 +0100 (Wed, 09 Dec 2009) | 14 lines
    
    Recorded merge of revisions 1060688 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1060688 | winterz | 2009-12-09 11:29:35 -0500 (Wed, 09 Dec 2009) | 7 lines
      
      add proper support for binary vs. non-binary attachments to the Attachment class. which brings the code up to the KDE4 standards.
      
      fix incidence attachment support in KOrganizer's incidence editor.
      kolab/issue3961
      
      MERGE: e4 (maybe, I need to double-check). already in trunk
    ........
  ................
    r1061368 | tmcguire | 2009-12-11 16:18:49 +0100 (Fri, 11 Dec 2009) | 1 line
    
    Update Newslog.txt
  ................
    r1061421 | tmcguire | 2009-12-11 18:44:34 +0100 (Fri, 11 Dec 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1061432 | winterz | 2009-12-11 18:51:31 +0100 (Fri, 11 Dec 2009) | 10 lines
    
    Blocked revisions 1061419 via svnmerge
    
    ........
      r1061419 | winterz | 2009-12-11 12:44:16 -0500 (Fri, 11 Dec 2009) | 4 lines
      
      Update the Duration class to all the goodies provided by the version in trunk.
      this will allow us to do recurring alarm calculations easier.
      MERGE: none (already in e4 and trunk)
    ........
  ................
    r1061443 | winterz | 2009-12-11 19:20:00 +0100 (Fri, 11 Dec 2009) | 12 lines
    
    Blocked revisions 1061356,1061418 via svnmerge
    
    ........
      r1061356 | tmcguire | 2009-12-11 10:02:58 -0500 (Fri, 11 Dec 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1061418 | tmcguire | 2009-12-11 12:43:50 -0500 (Fri, 11 Dec 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1062371 | winterz | 2009-12-14 14:59:48 +0100 (Mon, 14 Dec 2009) | 8 lines
    
    Blocked revisions 1062367 via svnmerge
    
    ........
      r1062367 | ludwigreiter | 2009-12-14 08:26:10 -0500 (Mon, 14 Dec 2009) | 2 lines
      
      Update after test of newslog 2009-12-11.
    ........
  ................
    r1062467 | winterz | 2009-12-14 22:02:27 +0100 (Mon, 14 Dec 2009) | 12 lines
    
    Merged revisions 1062463 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1062463 | winterz | 2009-12-14 15:55:32 -0500 (Mon, 14 Dec 2009) | 6 lines
      
      Print the recipient's initial, preset status if not the default status.
      part of kolab/issue3964
      
      MERGE: e4,4.5 (new i18n strings)
    ........
  ................
    r1062635 | tmcguire | 2009-12-15 13:18:02 +0100 (Tue, 15 Dec 2009) | 1 line
    
    SVN_SILENT add issue 3916
  ................
................
  r1062989 | tmcguire | 2009-12-16 16:46:23 +0100 (Wed, 16 Dec 2009) | 19 lines
  
  SVN_MERGE
  SVN_SILENT
  Recorded merge of revisions 1061324 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1061324 | tmcguire | 2009-12-11 14:38:37 +0100 (Fri, 11 Dec 2009) | 10 lines
    
    SVN_MERGE
    Merged revisions 1057006 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1057006 | tmcguire | 2009-12-01 11:47:40 +0100 (Tue, 01 Dec 2009) | 2 lines
      
      Fiddle around with newlines to statisfy kolab/issue3928
    ........
  ................
................
  r1063097 | winterz | 2009-12-16 23:50:10 +0100 (Wed, 16 Dec 2009) | 17 lines
  
  Blocked revisions 1063092 via svnmerge
  
  ................
    r1063092 | winterz | 2009-12-16 17:44:02 -0500 (Wed, 16 Dec 2009) | 11 lines
    
    Merged revisions 1063017 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1063017 | tmcguire | 2009-12-16 13:18:37 -0500 (Wed, 16 Dec 2009) | 4 lines
      
      Change the import strings to clarify the differnce.
      kolab/issue3973
      MERGE: e4, 4.5
    ........
  ................
................
  r1063174 | scripty | 2009-12-17 11:21:58 +0100 (Thu, 17 Dec 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1063192 | lueck | 2009-12-17 12:08:28 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  open documentation from configuration dialog pages
  CCMAIL:147070
................
  r1063196 | lueck | 2009-12-17 12:23:38 +0100 (Thu, 17 Dec 2009) | 2 lines
  
  open korganizer documentation from configuration dialog pages
  CCBUG:147070
................

svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1063527