[SCM] kio packaging branch, master, updated. df927fa27ecc5638d91b38c0128c15072e2f277a

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue Sep 23 17:08:15 UTC 2014


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

The following commit has been merged in the master branch:
commit df927fa27ecc5638d91b38c0128c15072e2f277a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 23 19:08:05 2014 +0200

    sync to Kubuntu 5.2.0 packaging
---
 debian/changelog                     | 96 ++++++++++--------------------------
 debian/control                       | 74 +++++++++++++--------------
 debian/copyright                     | 10 ++--
 debian/kio.install                   |  2 +-
 debian/libkf5kiocore5.install        |  3 +-
 debian/libkf5kiocore5.symbols        | 30 ++++++++++-
 debian/libkf5kiofilewidgets5.install |  3 +-
 debian/libkf5kiofilewidgets5.symbols |  4 +-
 debian/libkf5kiontlm5.install        |  3 +-
 debian/libkf5kiowidgets5.install     |  3 +-
 debian/libkf5kiowidgets5.symbols     | 13 ++---
 debian/patches/series                |  1 -
 debian/rules                         |  6 +--
 debian/tests/control                 |  4 ++
 debian/tests/testsuite               | 10 ++++
 debian/tests/testsuite.xsession      | 10 ++++
 16 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0eb0930..ae68cae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,87 +1,43 @@
-kio (5.0.0a-0ubuntu1) UNRELEASED; urgency=medium
+kio (5.2.0-0ubuntu1) utopic; urgency=medium
 
   [ Jonathan Riddell ]
-  * Initial stable upstream release
-  * Add upstream_kurlrequester-dialog-accept-handling.diff from upstream
-
-  [ Scarlett Clark ]
-  * Fix install files
-  * Update watch file to stable
-  * Add Vcs
-  * New upstream tarball
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 02 Jul 2014 00:37:27 +0200
-
-kio (4.100.0-0ubuntu1) utopic; urgency=medium
-
-  [ Jonathan Riddell ]
-  * New upstream beta release
+  * New upstream release
+  * Use pkg-kde-tools version 3 scripts
 
   [ Scarlett Clark ]
-  * Bump depends versions
-  * Patch symbols
-  * Remove MISSING i386 
-  * Fix broken -dev depends 
+  * Patch symbols - removed 2 MISSING private symbols. 
+  * Cleanup copyright + move copyright extra details to comment to silence
+    space-in-std-shortname-in-dep5-copyright lintian error. 
+  * wrap-and-sort 
 
-  [ Harald Sitter ]
-  * Update kf5-kio.install with new files
-    + Also contains localization as it is (currently) exclusive to kioslaves
-  * Remove useless Pre-Depends fields used for multiarch compat in
-    releases older than trusty
-  * Remove incorrect Section fields
-  * Rename kf5-kio to kio and kf5-kio-dev to kio-dev and kf5-kio-dbg to kio-dbg
-    + Breaks+Replaces the previous packages
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:45:56 +0200
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 02 Jun 2014 13:40:49 +0100
+kio (5.1.0a-0ubuntu1) utopic; urgency=medium
 
-kio (4.99.0-0ubuntu1) trusty; urgency=medium
+  [ Rohan Garg ]
+  * Make sure we add the XS-Testsuite field to debian/control
 
   [ José Manuel Santamaría Lema ]
-  * Re-add -dev package after a faulty wrap-and-sort.
-  * Install *.pri files in arch dependent path.
-  * Use ${allLibraries} for -dev package dependencies.
-
-  [ Jonathan Riddell ]
-  * New upstream beta release
+  * Mark a couple of private symbols as optional in
+    libkf5kiowidgets5.symbols.
+  * Update libraries *.install paths so a soname bump doesn't go
+    unnoticed.
 
   [ Scarlett Clark ]
-  * Fix install paths
-  * Patch symbols
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 05 May 2014 15:39:44 +0100
-
-kio (4.98.0-0ubuntu1) trusty; urgency=medium
-
-  * New upstream beta release
-  * Update build-depends
+  * New upstream release
+  * Remove upstream_kurlrequester-dialog-accept-handling.diff applied upstream.
+  * New upstream tar due to regressions.
+  * Patch symbols using batchpatch. 
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 29 Mar 2014 10:56:27 +0000
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:15:17 +0200
 
-kio (4.97.0-0ubuntu1) trusty; urgency=medium
+kio (5.0.0a-0ubuntu1) utopic; urgency=medium
 
-  [ Jonathan Riddell ]
-  * New upstream alpha release
-  * Rename library package for soname 5
-
-  [ Scarlett Clark ]
-  * Fix dev package depends 
-  * Fix not-installed 
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Mar 2014 12:21:29 +0000
-
-kio (4.96.0-0ubuntu1) trusty; urgency=medium
-
-  [ Rohan Garg ]
-  * New upstream alpha release
-    - Drop all patches
-
-  [ Scarlett Clark ]
-  * libs changed to 4.x renamed files/entries. 
-
- -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 11 Feb 2014 18:34:57 +0100
+  * Initial stable upstream release
 
-kio (4.95.0-0ubuntu1) trusty; urgency=low
+  [ José Manuel Santamaría Lema ]
+  * Mark a couple of private symbols as optional in libkf5kiowidgets5.symbols
+    and clean up missing symbols from previous versions.
 
-  * Initial release
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 15 Jul 2014 16:11:35 +0200
 
- -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 20 Jan 2014 09:28:49 +0000
diff --git a/debian/control b/debian/control
index 5cb5c80..9c9366a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,48 +5,46 @@ Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Scarlett Clark <scarlett at scarlettgatelyclark.com>
 Build-Depends: cmake,
                debhelper (>= 9.0.0),
-               extra-cmake-modules (>= 1.0.0),
-               kdoctools-dev (>= 5.0.0),
+               extra-cmake-modules (>= 1.2.0),
+               kdoctools-dev (>= 5.2.0),
                libacl1-dev,
-               libkf5archive-dev (>= 5.0.0),
-               libkf5attica-dev (>= 5.0.0),
-               libkf5auth-dev (>= 5.0.0),
-               libkf5bookmarks-dev (>= 5.0.0),
-               libkf5codecs-dev (>= 5.0.0),
-               libkf5completion-dev (>= 5.0.0),
-               libkf5config-dev (>= 5.0.0),
-               libkf5configwidgets-dev (>= 5.0.0),
-               libkf5coreaddons-dev (>= 5.0.0),
-               libkf5crash-dev (>= 5.0.0),
-               libkf5dbusaddons-dev (>= 5.0.0),
-               libkf5globalaccel-dev (>= 5.0.0),
-               libkf5guiaddons-dev (>= 5.0.0),
-               libkf5i18n-dev (>= 5.0.0),
-               libkf5iconthemes-dev (>= 5.0.0),
-               libkf5itemviews-dev (>= 5.0.0),
-               libkf5jobwidgets-dev (>= 5.0.0),
-               libkf5kjs-dev (>= 5.0.0),
-               libkf5notifications-dev (>= 5.0.0),
-               libkf5service-dev (>= 5.0.0),
-               libkf5solid-dev (>= 5.0.0),
-               libkf5sonnet-dev (>= 5.0.0),
-               libkf5textwidgets-dev (>= 5.0.0),
-               libkf5wallet-dev (>= 5.0.0),
-               libkf5widgetsaddons-dev (>= 5.0.0),
-               libkf5windowsystem-dev (>= 5.0.0),
-               libkf5xmlgui-dev (>= 5.0.0),
+               libkf5archive-dev (>= 5.2.0),
+               libkf5attica-dev (>= 5.2.0),
+               libkf5auth-dev (>= 5.2.0),
+               libkf5bookmarks-dev (>= 5.2.0),
+               libkf5codecs-dev (>= 5.2.0),
+               libkf5completion-dev (>= 5.2.0),
+               libkf5config-dev (>= 5.2.0),
+               libkf5configwidgets-dev (>= 5.2.0),
+               libkf5coreaddons-dev (>= 5.2.0),
+               libkf5crash-dev (>= 5.2.0),
+               libkf5dbusaddons-dev (>= 5.2.0),
+               libkf5globalaccel-dev (>= 5.2.0),
+               libkf5guiaddons-dev (>= 5.2.0),
+               libkf5i18n-dev (>= 5.2.0),
+               libkf5iconthemes-dev (>= 5.2.0),
+               libkf5itemviews-dev (>= 5.2.0),
+               libkf5jobwidgets-dev (>= 5.2.0),
+               libkf5kjs-dev (>= 5.2.0),
+               libkf5notifications-dev (>= 5.2.0),
+               libkf5service-dev (>= 5.2.0),
+               libkf5solid-dev (>= 5.2.0),
+               libkf5sonnet-dev (>= 5.2.0),
+               libkf5textwidgets-dev (>= 5.2.0),
+               libkf5wallet-dev (>= 5.2.0),
+               libkf5widgetsaddons-dev (>= 5.2.0),
+               libkf5windowsystem-dev (>= 5.2.0),
+               libkf5xmlgui-dev (>= 5.2.0),
                libkrb5-dev,
                libxml2-dev,
                libxslt1-dev,
-               openbox,
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev,
                qtscript5-dev,
-               xauth,
-               xvfb,
                zlib1g-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kio
+XS-Testsuite: autopkgtest
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kio
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kio
 
@@ -58,17 +56,15 @@ Depends: kio (= ${binary:Version}),
          libkf5completion-dev,
          libkf5itemviews-dev,
          libkf5jobwidgets-dev,
-         libkf5service-dev,
-         libkf5solid-dev,
-         libkf5xmlgui-dev,
          libkf5kiocore5 (= ${binary:Version}),
          libkf5kiofilewidgets5 (= ${binary:Version}),
          libkf5kiontlm5 (= ${binary:Version}),
          libkf5kiowidgets5 (= ${binary:Version}),
+         libkf5service-dev,
+         libkf5solid-dev,
+         libkf5xmlgui-dev,
          qtbase5-dev,
          ${misc:Depends}
-Breaks: kf5-kio-dev
-Replaces: kf5-kio-dev
 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.
@@ -81,8 +77,6 @@ Description: Resource and network access abstraction.
 Package: kio
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kf5-kio
-Replaces: kf5-kio
 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.
diff --git a/debian/copyright b/debian/copyright
index 02453f3..9c9819d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: kio
 Source: https://projects.kde.org/projects/frameworks/kio
 
 Files: *
+       debian/*
 Copyright: © 1998-2013 David Faure <faure at kde.org> <faure+bluesystems at kde.org>
            © 1998-2003 Stephan Kulow <coolo at kde.org>
            © 1998, 1998-, 1999-2000, 2000-, 2001-2009 Waldo Bastian <bastian at kde.org> <bastain at kde.org>
@@ -89,6 +90,7 @@ Copyright: © 1998-2013 David Faure <faure at kde.org> <faure+bluesystems at kde.org>
            © 2004 Scott Wheeler <wheeler at kde.org>
            © 2001 Lubos Lunak <l.lunak at kde.org>
            © 2009 Patrick Spendrin <ps_ml at gmx.de>
+           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -145,7 +147,7 @@ License: BSD-BY-LC-NE
 
 Files: src/widgets/getgrouplist-fake.c
 Copyright: 1991, 1993 The Regents of the University of California
-License: 2-clause BSD
+License: BSD-4-clause
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
@@ -424,7 +426,7 @@ Copyright: 2013 David Faure <faure at kde.org>
            2008 Roland Harnau <tau at gmx.eu>
            2009 Michael Leupold <lemma at confuego.org>
            2010 Rodrigo Belem <rclbelem at gmail.com>
-License: LGPL-2.1+ accepted by the membership of KDE e.V.
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -440,6 +442,7 @@ License: LGPL-2.1+ accepted by the membership of KDE e.V.
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this library.  If not, see <http://www.gnu.org/licenses/>
+Comment:  or any later version accepted by the membership of KDE e.V.
 
 Files: src/widgets/kdynamicjobtracker.cpp
        src/widgets/kdynamicjobtracker_p.h
@@ -523,13 +526,12 @@ Files: autotests/kurlnavigatortest.cpp
        autotests/kurlnavigatortest.h
        src/ioslaves/http/kcookiejar/kcookiewin.h
        src/ioslaves/telnet/ktelnetservice.cpp
-       debian/*
+       src/urifilters/ikws/*
 Copyright: 2008 Peter Penz <peter.penz at gmx.at>
            1998- Waldo Bastian (bastian at kde.org)
            2000- Dawit Alemayehu (adawit at kde.org)
            2001 Malte Starostik <malte at kde.org>
            2000 Simon Hausmann <hausmann at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/kio.install b/debian/kio.install
index d10d1b6..318121a 100644
--- a/debian/kio.install
+++ b/debian/kio.install
@@ -1,3 +1,4 @@
+# Only used in KIO slaves
 etc/xdg/accept-languages.codes
 etc/xdg/kshorturifilterrc
 usr/bin/*
@@ -9,5 +10,4 @@ usr/share/kf5/kcookiejar/domain_info
 usr/share/knotifications5/proxyscout.notifyrc
 usr/share/kservices5/*
 usr/share/kservicetypes5/*
-# Only used in KIO slaves
 usr/share/locale/*/LC_MESSAGES/kio5.mo
diff --git a/debian/libkf5kiocore5.install b/debian/libkf5kiocore5.install
index fa621c6..72360a2 100644
--- a/debian/libkf5kiocore5.install
+++ b/debian/libkf5kiocore5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5KIOCore.so.5*
+usr/lib/*/libKF5KIOCore.so.5
+usr/lib/*/libKF5KIOCore.so.5.*
diff --git a/debian/libkf5kiocore5.symbols b/debian/libkf5kiocore5.symbols
index 840c590..19ded44 100644
--- a/debian/libkf5kiocore5.symbols
+++ b/debian/libkf5kiocore5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.0.0 amd64
+# SymbolsHelper-Confirmed: 5.2.0 amd64
 libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _Z22_allKsslCaCertificatesP22KSslCertificateManager at Base 4.96.0
  _Z25_setAllKsslCaCertificatesP22KSslCertificateManagerRK5QListI17KSslCaCertificateE at Base 4.96.0
@@ -376,6 +376,15 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZN25OrgKdeKDirNotifyInterfaceD0Ev at Base 4.96.0
  _ZN25OrgKdeKDirNotifyInterfaceD1Ev at Base 4.96.0
  _ZN25OrgKdeKDirNotifyInterfaceD2Ev at Base 4.96.0
+ _ZN3KIO10RestoreJob10slotResultEP4KJob at Base 5.2.0
+ _ZN3KIO10RestoreJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.2.0
+ _ZN3KIO10RestoreJob11qt_metacastEPKc at Base 5.2.0
+ _ZN3KIO10RestoreJob16staticMetaObjectE at Base 5.2.0
+ _ZN3KIO10RestoreJobC1ERNS_17RestoreJobPrivateE at Base 5.2.0
+ _ZN3KIO10RestoreJobC2ERNS_17RestoreJobPrivateE at Base 5.2.0
+ _ZN3KIO10RestoreJobD0Ev at Base 5.2.0
+ _ZN3KIO10RestoreJobD1Ev at Base 5.2.0
+ _ZN3KIO10RestoreJobD2Ev at Base 5.2.0
  _ZN3KIO10SpecialJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.96.0
  _ZN3KIO10SpecialJob11qt_metacastEPKc at Base 4.96.0
  _ZN3KIO10SpecialJob12setArgumentsERK10QByteArray at Base 4.96.0
@@ -385,6 +394,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZN3KIO10SpecialJobD0Ev at Base 4.96.0
  _ZN3KIO10SpecialJobD1Ev at Base 4.96.0
  _ZN3KIO10SpecialJobD2Ev at Base 4.96.0
+ _ZN3KIO10emptyTrashEv at Base 5.2.0
  _ZN3KIO11FileCopyJob10slotResultEP4KJob at Base 4.96.0
  _ZN3KIO11FileCopyJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.96.0
  _ZN3KIO11FileCopyJob11qt_metacastEPKc at Base 4.96.0
@@ -491,6 +501,15 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZN3KIO12TCPSlaveBaseD2Ev at Base 4.96.0
  _ZN3KIO12davPropPatchERK4QUrlRK12QDomDocument6QFlagsINS_7JobFlagEE at Base 4.96.0
  _ZN3KIO12mostLocalUrlERK4QUrl6QFlagsINS_7JobFlagEE at Base 4.96.0
+ _ZN3KIO13EmptyTrashJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.2.0
+ _ZN3KIO13EmptyTrashJob11qt_metacastEPKc at Base 5.2.0
+ _ZN3KIO13EmptyTrashJob12slotFinishedEv at Base 5.2.0
+ _ZN3KIO13EmptyTrashJob16staticMetaObjectE at Base 5.2.0
+ _ZN3KIO13EmptyTrashJobC1ERNS_20EmptyTrashJobPrivateE at Base 5.2.0
+ _ZN3KIO13EmptyTrashJobC2ERNS_20EmptyTrashJobPrivateE at Base 5.2.0
+ _ZN3KIO13EmptyTrashJobD0Ev at Base 5.2.0
+ _ZN3KIO13EmptyTrashJobD1Ev at Base 5.2.0
+ _ZN3KIO13EmptyTrashJobD2Ev at Base 5.2.0
  _ZN3KIO13directorySizeERK13KFileItemList at Base 4.96.0
  _ZN3KIO13directorySizeERK4QUrl at Base 4.96.0
  _ZN3KIO13favIconForUrlERK4QUrl at Base 4.96.0
@@ -568,6 +587,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZN3KIO16DirectorySizeJobD1Ev at Base 4.96.0
  _ZN3KIO16DirectorySizeJobD2Ev at Base 4.96.0
  _ZN3KIO16buildErrorStringEiRK7QString at Base 4.96.0
+ _ZN3KIO16restoreFromTrashERK5QListI4QUrlE6QFlagsINS_7JobFlagEE at Base 5.2.0
  _ZN3KIO17DesktopExecParser14executableNameERK7QString at Base 4.96.0
  _ZN3KIO17DesktopExecParser14executablePathERK7QString at Base 4.96.0
  _ZN3KIO17DesktopExecParser16hasSchemeHandlerERK4QUrl at Base 4.96.0
@@ -1284,6 +1304,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZNK23KFileItemListProperties8mimeTypeEv at Base 4.96.0
  _ZNK23KFileItemListProperties9mimeGroupEv at Base 4.96.0
  _ZNK25OrgKdeKDirNotifyInterface10metaObjectEv at Base 4.96.0
+ _ZNK3KIO10RestoreJob10metaObjectEv at Base 5.2.0
  _ZNK3KIO10SpecialJob10metaObjectEv at Base 4.96.0
  _ZNK3KIO10SpecialJob9argumentsEv at Base 4.96.0
  _ZNK3KIO11FileCopyJob10metaObjectEv at Base 4.96.0
@@ -1303,6 +1324,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZNK3KIO12TCPSlaveBase5atEndEv at Base 4.96.0
  _ZNK3KIO12TCPSlaveBase6socketEv at Base 4.96.0
  _ZNK3KIO12TCPSlaveBase9isAutoSslEv at Base 4.96.0
+ _ZNK3KIO13EmptyTrashJob10metaObjectEv at Base 5.2.0
  _ZNK3KIO14SlaveInterface10connectionEv at Base 4.96.0
  _ZNK3KIO14SlaveInterface10metaObjectEv at Base 4.96.0
  _ZNK3KIO14SlaveInterface6offsetEv at Base 4.96.0
@@ -1454,6 +1476,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTI4KACL at Base 4.96.0
  _ZTI9KNFSShare at Base 4.96.0
  _ZTIN14KCoreDirLister7Private14CachedItemsJobE at Base 4.96.0
+ _ZTIN3KIO10RestoreJobE at Base 5.2.0
  _ZTIN3KIO10SpecialJobE at Base 4.96.0
  _ZTIN3KIO11FileCopyJobE at Base 4.96.0
  _ZTIN3KIO11MimetypeJobE at Base 4.96.0
@@ -1461,6 +1484,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTIN3KIO11SlaveConfigE at Base 4.96.0
  _ZTIN3KIO11TransferJobE at Base 4.96.0
  _ZTIN3KIO12TCPSlaveBaseE at Base 4.96.0
+ _ZTIN3KIO13EmptyTrashJobE at Base 5.2.0
  _ZTIN3KIO14SlaveInterfaceE at Base 4.96.0
  _ZTIN3KIO16ConnectionServerE at Base 4.96.0
  _ZTIN3KIO16DirectorySizeJobE at Base 4.96.0
@@ -1493,6 +1517,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTS4KACL at Base 4.96.0
  _ZTS9KNFSShare at Base 4.96.0
  _ZTSN14KCoreDirLister7Private14CachedItemsJobE at Base 4.96.0
+ _ZTSN3KIO10RestoreJobE at Base 5.2.0
  _ZTSN3KIO10SpecialJobE at Base 4.96.0
  _ZTSN3KIO11FileCopyJobE at Base 4.96.0
  _ZTSN3KIO11MimetypeJobE at Base 4.96.0
@@ -1500,6 +1525,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTSN3KIO11SlaveConfigE at Base 4.96.0
  _ZTSN3KIO11TransferJobE at Base 4.96.0
  _ZTSN3KIO12TCPSlaveBaseE at Base 4.96.0
+ _ZTSN3KIO13EmptyTrashJobE at Base 5.2.0
  _ZTSN3KIO14SlaveInterfaceE at Base 4.96.0
  _ZTSN3KIO16ConnectionServerE at Base 4.96.0
  _ZTSN3KIO16DirectorySizeJobE at Base 4.96.0
@@ -1532,6 +1558,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTV4KACL at Base 4.96.0
  _ZTV9KNFSShare at Base 4.96.0
  _ZTVN14KCoreDirLister7Private14CachedItemsJobE at Base 4.96.0
+ _ZTVN3KIO10RestoreJobE at Base 5.2.0
  _ZTVN3KIO10SpecialJobE at Base 4.96.0
  _ZTVN3KIO11FileCopyJobE at Base 4.96.0
  _ZTVN3KIO11MimetypeJobE at Base 4.96.0
@@ -1539,6 +1566,7 @@ libKF5KIOCore.so.5 libkf5kiocore5 #MINVER#
  _ZTVN3KIO11SlaveConfigE at Base 4.96.0
  _ZTVN3KIO11TransferJobE at Base 4.96.0
  _ZTVN3KIO12TCPSlaveBaseE at Base 4.96.0
+ _ZTVN3KIO13EmptyTrashJobE at Base 5.2.0
  _ZTVN3KIO14SlaveInterfaceE at Base 4.96.0
  _ZTVN3KIO16ConnectionServerE at Base 4.96.0
  _ZTVN3KIO16DirectorySizeJobE at Base 4.96.0
diff --git a/debian/libkf5kiofilewidgets5.install b/debian/libkf5kiofilewidgets5.install
index f8f72d3..4435ab1 100644
--- a/debian/libkf5kiofilewidgets5.install
+++ b/debian/libkf5kiofilewidgets5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5KIOFileWidgets.so.5*
+usr/lib/*/libKF5KIOFileWidgets.so.5
+usr/lib/*/libKF5KIOFileWidgets.so.5.*
diff --git a/debian/libkf5kiofilewidgets5.symbols b/debian/libkf5kiofilewidgets5.symbols
index d23d4b4..851d5c7 100644
--- a/debian/libkf5kiofilewidgets5.symbols
+++ b/debian/libkf5kiofilewidgets5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4.100.0 amd64
+# SymbolsHelper-Confirmed: 5.2.0 amd64
 libKF5KIOFileWidgets.so.5 libkf5kiofilewidgets5 #MINVER#
  _ZN11KFileWidget10readConfigER12KConfigGroup at Base 4.96.0
  _ZN11KFileWidget10slotCancelEv at Base 4.96.0
@@ -276,7 +276,6 @@ libKF5KIOFileWidgets.so.5 libkf5kiofilewidgets5 #MINVER#
  _ZN15KFilePlacesView7Private13adaptItemSizeEv at Base 4.96.0
  _ZN15KFilePlacesView7Private15_k_placeClickedERK11QModelIndex at Base 4.96.0
  _ZN15KFilePlacesView7Private15_k_placeEnteredERK11QModelIndex at Base 4.96.0
- _ZN15KFilePlacesView7Private15_k_trashUpdatedEP4KJob at Base 4.96.0
  _ZN15KFilePlacesView7Private15fadeCapacityBarERK11QModelIndexNS0_8FadeTypeE at Base 4.96.0
  _ZN15KFilePlacesView7Private15setCurrentIndexERK11QModelIndex at Base 4.96.0
  _ZN15KFilePlacesView7Private16updateHiddenRowsEv at Base 4.96.0
@@ -414,7 +413,6 @@ libKF5KIOFileWidgets.so.5 libkf5kiofilewidgets5 #MINVER#
  _ZN21KFilePreviewGenerator7Private18applyCutItemEffectERK13KFileItemList at Base 4.96.0
  _ZN21KFilePreviewGenerator7Private18clearCutItemsCacheEv at Base 4.96.0
  _ZN21KFilePreviewGenerator7Private19requestSequenceIconERK11QModelIndexi at Base 4.96.0
- _ZN21KFilePreviewGenerator7Private20decodeIsCutSelectionEPK9QMimeData at Base 4.96.0
  _ZN21KFilePreviewGenerator7Private20rowsAboutToBeRemovedERK11QModelIndexii at Base 4.96.0
  _ZN21KFilePreviewGenerator7Private22slotPreviewJobFinishedEP4KJob at Base 4.96.0
  _ZN21KFilePreviewGenerator7Private22startMimeTypeResolvingEv at Base 4.96.0
diff --git a/debian/libkf5kiontlm5.install b/debian/libkf5kiontlm5.install
index 1fe3691..b5b1fff 100644
--- a/debian/libkf5kiontlm5.install
+++ b/debian/libkf5kiontlm5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5KIONTLM.so.5*
+usr/lib/*/libKF5KIONTLM.so.5
+usr/lib/*/libKF5KIONTLM.so.5.*
diff --git a/debian/libkf5kiowidgets5.install b/debian/libkf5kiowidgets5.install
index 395d375..7fe687f 100644
--- a/debian/libkf5kiowidgets5.install
+++ b/debian/libkf5kiowidgets5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5KIOWidgets.so.5*
+usr/lib/*/libKF5KIOWidgets.so.5
+usr/lib/*/libKF5KIOWidgets.so.5.*
diff --git a/debian/libkf5kiowidgets5.symbols b/debian/libkf5kiowidgets5.symbols
index cd53a66..7ea08f8 100644
--- a/debian/libkf5kiowidgets5.symbols
+++ b/debian/libkf5kiowidgets5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4.100.0 amd64
+# SymbolsHelper-Confirmed: 5.2.0 amd64
 libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN10KAutoMount11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.96.0
  _ZN10KAutoMount11qt_metacastEPKc at Base 4.96.0
@@ -91,7 +91,7 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN13KUrlRequester18setPlaceholderTextERK7QString at Base 4.96.0
  _ZN13KUrlRequester20KUrlRequesterPrivate16_k_slotUpdateUrlEv at Base 4.96.0
  _ZN13KUrlRequester20KUrlRequesterPrivate17_k_slotOpenDialogEv at Base 4.96.0
- _ZN13KUrlRequester20KUrlRequesterPrivate25_k_slotFileDialogFinishedEv at Base 4.96.0
+ (optional)_ZN13KUrlRequester20KUrlRequesterPrivate25_k_slotFileDialogAcceptedEv at Base 5.0.0
  _ZN13KUrlRequester20KUrlRequesterPrivate4initEv at Base 4.96.0
  _ZN13KUrlRequester21setFileDialogModalityEN2Qt14WindowModalityE at Base 4.96.0
  _ZN13KUrlRequester5clearEv at Base 4.96.0
@@ -162,8 +162,6 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN14KUrlCompletionD0Ev at Base 4.96.0
  _ZN14KUrlCompletionD1Ev at Base 4.96.0
  _ZN14KUrlCompletionD2Ev at Base 4.96.0
-#MISSING: 4.99.0# _ZN14ThumbCreatorV218writeConfigurationEPK7QWidget at Base 4.96.0
-#MISSING: 4.99.0# _ZN14ThumbCreatorV225createConfigurationWidgetEv at Base 4.96.0
  _ZN14ThumbCreatorV2D0Ev at Base 4.96.0
  _ZN14ThumbCreatorV2D1Ev at Base 4.96.0
  _ZN14ThumbCreatorV2D2Ev at Base 4.96.0
@@ -219,9 +217,6 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN16KUriFilterPlugin16staticMetaObjectE at Base 4.96.0
  _ZN16KUriFilterPluginC1ERK7QStringP7QObject at Base 4.96.0
  _ZN16KUriFilterPluginC2ERK7QStringP7QObject at Base 4.96.0
- _ZN16KUriFilterPluginD0Ev at Base 4.96.0
- _ZN16KUriFilterPluginD1Ev at Base 4.96.0
- _ZN16KUriFilterPluginD2Ev at Base 4.96.0
  _ZN17KFileItemDelegate11editorEventEP6QEventP18QAbstractItemModelRK20QStyleOptionViewItemRK11QModelIndex at Base 4.96.0
  _ZN17KFileItemDelegate11eventFilterEP7QObjectP6QEvent at Base 4.96.0
  _ZN17KFileItemDelegate11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.96.0
@@ -482,6 +477,7 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN3KIO13JobUiDelegate11qt_metacastEPKc at Base 4.96.0
  _ZN3KIO13JobUiDelegate13askFileRenameEP4KJobRK7QStringRK4QUrlS8_6QFlagsINS_19RenameDialog_OptionEERS3_yyRK9QDateTimeSF_SF_SF_ at Base 4.96.0
  _ZN3KIO13JobUiDelegate16staticMetaObjectE at Base 4.96.0
+ _ZN3KIO13JobUiDelegate16unregisterWindowEP7QWidget at Base 5.2.0
  _ZN3KIO13JobUiDelegate17requestMessageBoxENS_22JobUiDelegateExtension14MessageBoxTypeERK7QStringS5_S5_S5_S5_S5_S5_RKNS_8MetaDataE at Base 4.96.0
  _ZN3KIO13JobUiDelegate20updateUrlInClipboardERK4QUrlS3_ at Base 4.96.0
  _ZN3KIO13JobUiDelegate21askDeleteConfirmationERK5QListI4QUrlENS_22JobUiDelegateExtension12DeletionTypeENS6_16ConfirmationTypeE at Base 4.96.0
@@ -527,6 +523,8 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN3KIO15FileUndoManagerD2Ev at Base 4.96.0
  _ZN3KIO15pasteActionTextEv at Base 4.96.0
  _ZN3KIO16canPasteMimeDataEPK9QMimeData at Base 4.96.0
+ _ZN3KIO18isClipboardDataCutEPK9QMimeData at Base 5.2.0
+ _ZN3KIO19setClipboardDataCutEP9QMimeDatab at Base 5.2.0
  _ZN3KIO5SslUi18askIgnoreSslErrorsEPK10KTcpSocketNS0_12RulesStorageE at Base 4.96.0
  _ZN3KIO5SslUi18askIgnoreSslErrorsERK15KSslErrorUiDataNS0_12RulesStorageE at Base 4.96.0
  _ZN4KRun10binaryNameERK7QStringb at Base 4.96.0
@@ -624,7 +622,6 @@ libKF5KIOWidgets.so.5 libkf5kiowidgets5 #MINVER#
  _ZN9KDirModelD0Ev at Base 4.96.0
  _ZN9KDirModelD1Ev at Base 4.96.0
  _ZN9KDirModelD2Ev at Base 4.96.0
- _ZN9QBitArray8clearBitEi at Base 4.96.0
  _ZNK10KAutoMount10metaObjectEv at Base 4.96.0
  _ZNK10KDirLister10metaObjectEv at Base 4.96.0
  _ZNK10KDirLister24autoErrorHandlingEnabledEv at Base 4.96.0
diff --git a/debian/patches/series b/debian/patches/series
index b3fe4a2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_kurlrequester-dialog-accept-handling.diff
diff --git a/debian/rules b/debian/rules
index 2e6d3ec..17f321c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kio-dbg
 
-override_dh_auto_test:
-	dh_installwm openbox\
-	xvfb-run -a dh_auto_test
+.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..e7fde3c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11, openbox
+Restrictions: rw-build-tree
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100644
index 0000000..00220b9
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -d /usr/lib/ccache ]; then
+    export PATH="/usr/lib/ccache:$PATH"
+fi
+debian/rules clean 2>&1
+dpkg-source --before-build .
+debian/rules build 2>&1
+xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..3a00834
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+[ -e debian/tests.home ] || mkdir debian/tests.home
+HOME=debian/tests.home openbox &
+sleep 5
+HOME=debian/tests.home dh_auto_test
+rm -rf debian/home/tests.home
+

-- 
kio packaging



More information about the pkg-kde-commits mailing list