[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu3-70-gabcbe88

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit abcbe88c40212b885f6d43b75fba59c9a5c828f9
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 15:17:47 2016 +0000

    Fixing package
    
    - Removing libkf5kiogui5-dev.install and ref in control file
    - Adding contents of libkf5kiogui5-dev.install to kio-dev.install
    - Wildcarding the API version in libkf5kiogui5.install
    - Fixing changelog
---
 debian/changelog                 | 22 ++++++++++------------
 debian/control                   | 14 --------------
 debian/kio-dev.install           |  5 +++++
 debian/libkf5kiogui5-dev.install |  5 -----
 debian/libkf5kiogui5.install     |  2 +-
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bdef217..872f2e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,4 @@
-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
+kio (5.18.0-1ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * New upstream release Xenial
@@ -18,10 +10,16 @@ kio (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
   * 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
+ -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 15:11:59 +0000
+
+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.16.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ef6b1d8..47934ca 100644
--- a/debian/control
+++ b/debian/control
@@ -121,20 +121,6 @@ Description: Resource and network access abstraction.
  .
  This library contains some file dialog widgets.
 
-Package: libkf5kiogui5-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Multi-Arch: same
-Description: Resource and network access abstraction.
- KDE Input/Output framework provides a single API for
- operating on files, whether local or on a remote server.
- Additionally, KIO Slaves provide support for individual
- protocols. Some particularly useful ones are http, ftp,
- sftp, smb, nfs, ssh (fish), man, tar and zip.
- .
- This library contains some file dialog widgets.
-
 Package: libkf5kiontlm5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/kio-dev.install b/debian/kio-dev.install
index 9ff44aa..e622013 100644
--- a/debian/kio-dev.install
+++ b/debian/kio-dev.install
@@ -1,15 +1,20 @@
 usr/include/KF5/KIOCore/
 usr/include/KF5/KIOFileWidgets/
+usr/include/KF5/KIOGui/KIO/FavIconRequestJob
+usr/include/KF5/KIOGui/kio/faviconrequestjob.h
+usr/include/KF5/KIOGui/kiogui_export.h
 usr/include/KF5/KIOWidgets/
 usr/include/KF5/kio/
 usr/include/KF5/kio_version.h
 usr/lib/*/cmake/KF5KIO/
 usr/lib/*/libKF5KIOCore.so
 usr/lib/*/libKF5KIOFileWidgets.so
+usr/lib/*/libKF5KIOGui.so
 usr/lib/*/libKF5KIONTLM.so
 usr/lib/*/libKF5KIOWidgets.so
 usr/lib/*/qt5/mkspecs/modules/qt_KIOCore.pri
 usr/lib/*/qt5/mkspecs/modules/qt_KIOFileWidgets.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KIOGui.pri
 usr/lib/*/qt5/mkspecs/modules/qt_KIOWidgets.pri
 usr/lib/*/qt5/mkspecs/modules/qt_KNTLM.pri
 usr/share/dbus-1/interfaces/kf5_org.kde.KCookieServer.xml
diff --git a/debian/libkf5kiogui5-dev.install b/debian/libkf5kiogui5-dev.install
deleted file mode 100644
index ebbc4c0..0000000
--- a/debian/libkf5kiogui5-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/KF5/KIOGui/KIO/FavIconRequestJob
-usr/include/KF5/KIOGui/kio/faviconrequestjob.h
-usr/include/KF5/KIOGui/kiogui_export.h
-usr/lib/*/libKF5KIOGui.so
-usr/lib/*/qt5/mkspecs/modules/qt_KIOGui.pri
diff --git a/debian/libkf5kiogui5.install b/debian/libkf5kiogui5.install
index e3073e2..41ab789 100644
--- a/debian/libkf5kiogui5.install
+++ b/debian/libkf5kiogui5.install
@@ -1,2 +1,2 @@
 usr/lib/*/libKF5KIOGui.so.5
-usr/lib/*/libKF5KIOGui.so.5.19.0
+usr/lib/*/libKF5KIOGui.so.5.*

-- 
kio packaging