kubuntu-packaging

Merge ~panfaust/kubuntu-packaging/+git/kio:work into ~kubuntu-packagers/kubuntu-packaging/+git/kio:kubuntu_yakkety_backports

  1. Git
  2. lp:~panfaust/kubuntu-packaging/+git/kio
  3. work
  4. Merge into kubuntu_yakkety_backports
Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: fd546ccbacb01d5d8d2dc5ed442e19eb911941da
Proposed branch: ~panfaust/kubuntu-packaging/+git/kio:work
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kio:kubuntu_yakkety_backports
Diff against target: 37 lines (+4/-2)
2 files modified
debian/changelog (+4/-0)
debian/libkf5kiowidgets5.symbols (+0/-2)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+305894@code.launchpad.net

Description of the change

Remove a couple of missing symbols for i386.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 3b1f114..8844cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
1kio (5.26.0-0ubuntu1) UNRELEASED; urgency=medium1kio (5.26.0-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Rik Mills ]
3 * Refresh patch kubuntu_failing-tests.diff4 * Refresh patch kubuntu_failing-tests.diff
4 * New upstream release (5.26.0)5 * New upstream release (5.26.0)
56
7 [ José Manuel Santamaría Lema ]
8 * Remove a couple of deprecated symbols.
9
6 -- Rik Mills <rik.mills88@gmail.com> Sat, 10 Sep 2016 15:32:07 +010010 -- Rik Mills <rik.mills88@gmail.com> Sat, 10 Sep 2016 15:32:07 +0100
711
8kio (5.24.0-0ubuntu1) yakkety; urgency=medium12kio (5.24.0-0ubuntu1) yakkety; urgency=medium
diff --git a/debian/libkf5kiowidgets5.symbols b/debian/libkf5kiowidgets5.symbols
index 81de9a7..4adf22e 100644
--- a/debian/libkf5kiowidgets5.symbols
+++ b/debian/libkf5kiowidgets5.symbols
@@ -251,7 +251,6 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
251 _ZN17KPropertiesDialog10showDialogERK4QUrlP7QWidgetb@Base 4.96.0251 _ZN17KPropertiesDialog10showDialogERK4QUrlP7QWidgetb@Base 4.96.0
252 _ZN17KPropertiesDialog10showDialogERK5QListI4QUrlEP7QWidgetb@Base 5.10.0252 _ZN17KPropertiesDialog10showDialogERK5QListI4QUrlEP7QWidgetb@Base 5.10.0
253 _ZN17KPropertiesDialog10showDialogERK9KFileItemP7QWidgetb@Base 4.96.0253 _ZN17KPropertiesDialog10showDialogERK9KFileItemP7QWidgetb@Base 4.96.0
254 (arch=i386)_ZN17KPropertiesDialog10slotCancelEv@Base 5.24.0+p16.10+git20160723.0748
255 _ZN17KPropertiesDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0254 _ZN17KPropertiesDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.96.0
256 _ZN17KPropertiesDialog11qt_metacastEPKc@Base 4.96.0255 _ZN17KPropertiesDialog11qt_metacastEPKc@Base 4.96.0
257 _ZN17KPropertiesDialog12insertPluginEP23KPropertiesDialogPlugin@Base 4.96.0256 _ZN17KPropertiesDialog12insertPluginEP23KPropertiesDialogPlugin@Base 4.96.0
@@ -269,7 +268,6 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
269 (arch=amd64)_ZN17KPropertiesDialog6rejectEv@Base 5.24.0+p16.10+git20160723.0748268 (arch=amd64)_ZN17KPropertiesDialog6rejectEv@Base 5.24.0+p16.10+git20160723.0748
270 _ZN17KPropertiesDialog6renameERK7QString@Base 4.96.0269 _ZN17KPropertiesDialog6renameERK7QString@Base 4.96.0
271 _ZN17KPropertiesDialog6saveAsERK4QUrlRS0_@Base 4.96.0270 _ZN17KPropertiesDialog6saveAsERK4QUrlRS0_@Base 4.96.0
272 (arch=i386)_ZN17KPropertiesDialog6slotOkEv@Base 5.24.0+p16.10+git20160723.0748
273 _ZN17KPropertiesDialog7appliedEv@Base 4.96.0271 _ZN17KPropertiesDialog7appliedEv@Base 4.96.0
274 _ZN17KPropertiesDialog8canceledEv@Base 4.96.0272 _ZN17KPropertiesDialog8canceledEv@Base 4.96.0
275 _ZN17KPropertiesDialog9updateUrlERK4QUrl@Base 4.96.0273 _ZN17KPropertiesDialog9updateUrlERK4QUrl@Base 4.96.0

Subscribers

People subscribed via source and target branches