[SCM] KDE Graphics module packaging branch, master, updated. debian/4.4.5-2-21-g6d07db6

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6d07db601b6edf32268c062fb350873405d15ce2
Author: Pino Toscano <pino at kde.org>
Date:   Tue Mar 1 23:59:54 2011 +0100

    drop patch 01_do_not_break_kexiv2_abi.diff, unneeded now
    
    binary compatibility has been broken with kde 4.6 anyway, and packages using it should have been fixed already
---
 debian/changelog                               |    2 -
 debian/libkexiv2-9.symbols                     |    1 -
 debian/patches/01_do_not_break_kexiv2_abi.diff |   26 ------------------------
 debian/patches/series                          |    1 -
 4 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8efdd4e..e6b4807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ kdegraphics (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Add myself to uploaders.
   * Remove patch 01_r1167826_CVE-2010-2575.diff; applied upstream.
   * Update installed files.
-  * Add patch 01_do_not_break_kexiv2_abi.diff to maintain binary
-    compatibility in libkexiv2.
   * Update symbols files.
   * Bump build dependency on kdelibs5-dev to version 4:4.6.
 
diff --git a/debian/libkexiv2-9.symbols b/debian/libkexiv2-9.symbols
index 7adebbd..0e81195 100644
--- a/debian/libkexiv2-9.symbols
+++ b/debian/libkexiv2-9.symbols
@@ -24,7 +24,6 @@ libkexiv2.so.9 libkexiv2-9 #MINVER#
  _ZN11KExiv2Iface11MsgTextEditD2Ev at Base 4:4.5.90
  _ZN11KExiv2Iface13SubjectWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.5.90
  _ZN11KExiv2Iface13SubjectWidget11qt_metacastEPKc at Base 4:4.5.90
- _ZN11KExiv2Iface13SubjectWidget14setSubjectListERK11QStringList at Base 4:4.5.90
  _ZN11KExiv2Iface13SubjectWidget14signalModifiedEv at Base 4:4.5.90
  _ZN11KExiv2Iface13SubjectWidget14slotAddSubjectEv at Base 4:4.5.90
  _ZN11KExiv2Iface13SubjectWidget14slotDelSubjectEv at Base 4:4.5.90
diff --git a/debian/patches/01_do_not_break_kexiv2_abi.diff b/debian/patches/01_do_not_break_kexiv2_abi.diff
deleted file mode 100644
index 5ae6dd4..0000000
--- a/debian/patches/01_do_not_break_kexiv2_abi.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/libs/libkexiv2/libkexiv2/subjectwidget.cpp
-+++ b/libs/libkexiv2/libkexiv2/subjectwidget.cpp
-@@ -595,4 +595,10 @@
-     return newSubjects;
- }
- 
-+//KDE5: Remove me
-+void SubjectWidget::setSubjectList(const QStringList& list)
-+{
-+    setSubjectsList(list);
-+}
-+
- }  // namespace KExiv2Iface
---- a/libs/libkexiv2/libkexiv2/subjectwidget.h
-+++ b/libs/libkexiv2/libkexiv2/subjectwidget.h
-@@ -78,6 +78,10 @@
-     void setSubjectsList(const QStringList& list);
-     QStringList subjectsList() const;
- 
-+    /** @deprecated Provided to keep binary compatibility with
-+     * older versions. Use setSubjectsList() instead. */
-+    KDE_DEPRECATED void setSubjectList(const QStringList& list);
-+
- Q_SIGNALS:
- 
-     void signalModified();
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0371f73..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_do_not_break_kexiv2_abi.diff

-- 
KDE Graphics module packaging