[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-3-6-gaa6a3c0

Sune Vuorela pusling-guest at alioth.debian.org
Mon Mar 7 09:19:16 UTC 2011


The following commit has been merged in the master branch:
commit 7f01aacafef4519603ba37bb3b87c9cdbbd8d16d
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Mar 7 10:18:24 2011 +0100

    unfuzzy patch so that dpkg can handle it
---
 debian/patches/backport_r1150375.diff |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/backport_r1150375.diff b/debian/patches/backport_r1150375.diff
index 39f4658..1b12b52 100644
--- a/debian/patches/backport_r1150375.diff
+++ b/debian/patches/backport_r1150375.diff
@@ -6,13 +6,11 @@ Small compatibility fix for the latest (minor) version of SIP which came out a c
 
 Applied-Upstream: 4.6.0
 
-Index: kdebindings/python/pykde4/sip/akonadi/addressattribute.sip
-===================================================================
---- kdebindings/python/pykde4/sip/akonadi/addressattribute.sip	(revision 1150374)
-+++ kdebindings/python/pykde4/sip/akonadi/addressattribute.sip	(revision 1150375)
-@@ -59,6 +59,10 @@
-     else if (dynamic_cast<Akonadi::PersistentSearchAttribute*>(sipCpp))
-         sipType = sipType_Akonadi_PersistentSearchAttribute;
+--- a/python/pykde4/sip/akonadi/addressattribute.sip
++++ b/python/pykde4/sip/akonadi/addressattribute.sip
+@@ -57,6 +57,10 @@ public:
+     else if (dynamic_cast<Akonadi::MessageThreadingAttribute*>(sipCpp))
+         sipType = sipType_Akonadi_MessageThreadingAttribute;
  %End
 +private:
 +//force

-- 
KDE Bindings module packaging



More information about the pkg-kde-commits mailing list