[SCM] KDE PIM Libraries module packaging branch, kde4.10, updated. debian/4.8.4-1-32-gee7e22a

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=3f366e8

The following commit has been merged in the kde4.10 branch:
commit 3f366e807fe51ef63e8d082588a5f7c2ed373911
Author: Josep Febrer Salord <jfebrer at gmail.com>
Date:   Thu Feb 7 23:29:45 2013 +0100

    Refresh dont_verify_akonadi_id.diff, to apply cleanly.
---
 debian/changelog                           |    1 +
 debian/patches/dont_verify_akonadi_id.diff |   15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7be4a44..ffe1a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ kdepimlibs (4:4.10.0-0r0) UNRELEASED; urgency=low
   [ Josep Febrer ]
   * Update patches
     - drop 03_hide_akonadi_progressbar.diff, no longer needed
+    - refresh dont_verify_akonadi_id.diff, to apply cleanly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 15 Nov 2012 23:10:43 +0100
 
diff --git a/debian/patches/dont_verify_akonadi_id.diff b/debian/patches/dont_verify_akonadi_id.diff
index 530cc58..2431b34 100644
--- a/debian/patches/dont_verify_akonadi_id.diff
+++ b/debian/patches/dont_verify_akonadi_id.diff
@@ -10,7 +10,7 @@ Description: Revert "Fix potential error when identity path is a string (bad con
 
 --- a/kpimidentities/identity.cpp
 +++ b/kpimidentities/identity.cpp
-@@ -428,20 +428,17 @@ QString Identity::dictionary() const
+@@ -437,20 +437,17 @@ QString Identity::dictionary() const
  
  QString Identity::templates() const
  {
@@ -34,11 +34,10 @@ Description: Revert "Fix potential error when identity path is a string (bad con
  }
  
  QString Identity::transport() const
-@@ -644,17 +641,3 @@ bool Identity::matchesEmailAddress( const QString & addr ) const
- 
+@@ -665,20 +662,6 @@ bool Identity::matchesEmailAddress( cons
    return false;
  }
--
+ 
 -QString Identity::verifyAkonadiId(const QString& str) const
 -{
 -  if(str.isEmpty())
@@ -52,11 +51,13 @@ Description: Revert "Fix potential error when identity path is a string (bad con
 -    return QString();
 -  }
 -}
-diff --git a/kpimidentities/identity.h b/kpimidentities/identity.h
-index 349ad4d..22b1f42 100644
+-
+ void Identity::setAutocorrectionLanguage(const QString& language)
+ {
+   setProperty( s_autocorrectionLanguage, language );
 --- a/kpimidentities/identity.h
 +++ b/kpimidentities/identity.h
-@@ -311,10 +311,6 @@ class KPIMIDENTITIES_EXPORT Identity
+@@ -325,10 +325,6 @@ class KPIMIDENTITIES_EXPORT Identity
        void setUoid( uint aUoid );
  
      protected:

-- 
KDE PIM Libraries module packaging