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

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit bd3db765b1bb12007058632568c23b53d3d1022c
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jan 10 11:45:24 2013 +0100

    Remove dont_break_libkabc_abi.diff, applied upstream.
---
 debian/changelog                           |    1 -
 debian/patches/dont_break_libkabc_abi.diff |   50 ----------------------------
 debian/patches/series                      |    1 -
 3 files changed, 0 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5efd41b..4fe5ca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,6 @@ kdepimlibs (4:4.9.5-0r0) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to 4:4.9.5.
   * Bump kdelibs5-dev build dependency to 4.9.
   * Bump libakonadi-dev build dependency to 1.8.1.
-  * Add dont_break_libkabc_abi.diff in order to maintain binary compatibility.
   * Update some installed files.
   * Add lintian overrides for hardening-no-fortify-functions.
 
diff --git a/debian/patches/dont_break_libkabc_abi.diff b/debian/patches/dont_break_libkabc_abi.diff
deleted file mode 100644
index 7ed38fd..0000000
--- a/debian/patches/dont_break_libkabc_abi.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-
diff --git a/debian/patches/series b/debian/patches/series
index 51bfe69..333e353 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 03_hide_akonadi_progressbar.diff
-dont_break_libkabc_abi.diff

-- 
KDE PIM Libraries module packaging