[SCM] KDE Graphics module packaging branch, kde4.5, updated. debian/4.4.5-2-7-g651945a
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Fri Sep 3 17:52:16 UTC 2010
The following commit has been merged in the kde4.5 branch:
commit 0b3f6f75ce50889cb7c84995f24f7db52751344c
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date: Fri Sep 3 20:49:11 2010 +0300
Add patch 01_do_not_break_kexiv2_abi.diff to maintain binary compatibility in libkexiv2.
---
debian/changelog | 2 +
debian/patches/01_do_not_break_kexiv2_abi.diff | 26 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee0df2e..d5e2a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ kdegraphics (4:4.5.1-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.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 03 Sep 2010 15:13:33 +0300
diff --git a/debian/patches/01_do_not_break_kexiv2_abi.diff b/debian/patches/01_do_not_break_kexiv2_abi.diff
new file mode 100644
index 0000000..5ae6dd4
--- /dev/null
+++ b/debian/patches/01_do_not_break_kexiv2_abi.diff
@@ -0,0 +1,26 @@
+--- 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
index c0ce4c3..8b6b656 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix_solid_camera_predicate.diff
+01_do_not_break_kexiv2_abi.diff
--
KDE Graphics module packaging
More information about the pkg-kde-commits
mailing list