[SCM] KDE PIM Libraries module packaging branch, kde4.9, updated. debian/4.8.4-1-15-gaa16e53

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit aa16e537e18cd442c9a57038fe6c26304b60990d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Nov 22 16:47:47 2012 +0100

    Actually add dont_break_libkabc_abi.diff, bump revision.
---
 debian/changelog                           |    2 +-
 debian/patches/dont_break_libkabc_abi.diff |   50 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0f3d41..e58eedd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdepimlibs (4:4.9.3-0r1) UNRELEASED; urgency=low
+kdepimlibs (4:4.9.3-0r2) UNRELEASED; urgency=low
 
   * New upstream release.
 
diff --git a/debian/patches/dont_break_libkabc_abi.diff b/debian/patches/dont_break_libkabc_abi.diff
new file mode 100644
index 0000000..7ed38fd
--- /dev/null
+++ b/debian/patches/dont_break_libkabc_abi.diff
@@ -0,0 +1,50 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Origin: http://commits.kde.org/kdepimlibs/614ec855f1b991927c586cf97526a787f2da4796
+Description: Avoid ABI break compared with 4.8.x.
+Applied-Upstream: 4.9.4
+
+--- a/kabc/scripts/addressee.src.cpp
++++ b/kabc/scripts/addressee.src.cpp
+@@ -544,7 +544,7 @@ void Addressee::removeKey( const Key &key )
+   }
+ }
+ 
+-Key Addressee::key( Key::Type type, const QString& customTypeString ) const
++Key Addressee::key( Key::Type type, QString customTypeString ) const
+ {
+   Key::List::ConstIterator it;
+   Key::List::ConstIterator end(d->mKeys.constEnd());
+@@ -575,7 +575,7 @@ Key::List Addressee::keys() const
+   return d->mKeys;
+ }
+ 
+-Key::List Addressee::keys( Key::Type type, const QString& customTypeString ) const
++Key::List Addressee::keys( Key::Type type, QString customTypeString ) const
+ {
+   Key::List list;
+ 
+diff --git a/kabc/scripts/addressee.src.h b/kabc/scripts/addressee.src.h
+index 90a858c..812efe0 100644
+--- a/kabc/scripts/addressee.src.h
++++ b/kabc/scripts/addressee.src.h
+@@ -276,7 +276,7 @@ class KABC_EXPORT Addressee
+       @param customTypeString A string to match custom keys against when
+              @p type is @c Key::Custom
+      */
+-    Key key( Key::Type type, const QString& customTypeString = QString() ) const;
++    Key key( Key::Type type, QString customTypeString = QString() ) const;
+ 
+     /**
+       Return list of all keys.
+@@ -299,7 +299,7 @@ class KABC_EXPORT Addressee
+       @param customTypeString A string to match custom keys against when
+              @p type is @c Key::Custom
+      */
+-    Key::List keys( Key::Type type, const QString& customTypeString = QString()  ) const;
++    Key::List keys( Key::Type type, QString customTypeString = QString()  ) const;
+ 
+     /**
+       Return key with the given id.
+-- 
+1.7.10.4
+

-- 
KDE PIM Libraries module packaging