[SCM] kio packaging branch, kubuntu_stable, updated. ubuntu/5.15.0-0ubuntu3-68-gf866a79

Clive Johnston clivejo-guest at moszumanska.debian.org
Sat Feb 6 20:32:20 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=f866a79

The following commit has been merged in the kubuntu_stable branch:
commit f866a792bf0eb7370ce3df6722c71e28c162a37a
Merge: 7e534da8c4b6cf7cc4f65f68eb6519b7d5d5202e e34550516efa947374d326ae096809d3b33fa78d
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 20:32:15 2016 +0000

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_stable

 debian/.gitattributes                          |   1 -
 debian/changelog                               | 114 +++++++++++++++++++++++++
 debian/control                                 |  34 +++++++-
 debian/kio.install                             |   3 +
 debian/libkf5kiocore5.symbols                  |  23 ++++-
 debian/libkf5kiofilewidgets5.symbols           |   3 +-
 debian/libkf5kiogui5-dev.install               |   5 ++
 debian/libkf5kiogui5.install                   |   2 +
 debian/patches/fix_kfreebsd_build              |  10 +--
 debian/patches/kubuntu_failing-tests.diff      |  35 ++++++++
 debian/patches/kubuntu_kdelibs4-docs-path.diff |  15 +++-
 debian/patches/series                          |   3 +-
 12 files changed, 232 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 53bad4f,3796fb2..bdef217
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,20 +1,28 @@@
 +kio (5.18.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.17.0).
 +  * Update symbols files from buildds logs (5.16.0-1).
 +  * New upstream release (5.18.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:31 +0100
 +
+ kio (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release Xenial
+ 
+   [ Philip Muškovac ]
+   * New upstream release
+ 
+   [ Clive Johnston ]
+   * Updating install file
+   * Updating symbols
+   * Adding new lib - libkf5kiogui5
+   * Adding new dev package for libkf5kiogui5
+   * Adding Section: libdevel to libkf5kiogui5-dev   
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:03:49 +0100
+ 
  kio (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/libkf5kiofilewidgets5.symbols
index ef7a223,272c9dd..e80810e
--- a/debian/libkf5kiofilewidgets5.symbols
+++ b/debian/libkf5kiofilewidgets5.symbols
@@@ -553,7 -554,7 +553,8 @@@ libKF5KIOFileWidgets.so.5 libkf5kiofile
   _ZNK13KUrlNavigator6editorEv at Base 4.96.0
   _ZNK13KUrlNavigator7Private15firstButtonTextEv at Base 4.96.0
   _ZNK13KUrlNavigator7Private16isCompressedPathERK4QUrl at Base 4.96.0
 + _ZNK13KUrlNavigator7Private16retrievePlaceUrlEv at Base 5.18.0
+  _ZNK13KUrlNavigator7Private16retrievePlaceUrlEv at Base 5.17.0
   _ZNK13KUrlNavigator7Private19removeTrailingSlashER7QString at Base 4.96.0
   _ZNK13KUrlNavigator7Private20adjustedHistoryIndexEi at Base 4.96.0
   _ZNK13KUrlNavigator7Private9buttonUrlEi at Base 4.96.0

-- 
kio packaging



More information about the pkg-kde-commits mailing list