Merge branch 'debian/experimental' into debian/sid

debian/changelog

@@ -89,7 +89,7 @@ libqtxdg (2.0.0-4) unstable; urgency=medium
 libqtxdg (1.3.0-4) unstable; urgency=medium
 
   * Added libfile-mimeinfo-perl as dependency, we really need this, a
-    recommendation is not enough. Thanks tsujan. 
+    recommendation is not enough. Thanks tsujan.
   * Bumped standards to 3.9.8, no changes needed
   * Bump years in copyright
   * Added README to debian/docs

debian/control

@@ -18,7 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/libqtxdg.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/libqtxdg.git -b debian/sid
 Homepage: https://github.com/lxde/libqtxdg
 
-Package: libqt5xdg2
+Package: libqt5xdg3
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -34,7 +34,7 @@ Description: Implementation of the XDG Specifications for Qt (shared lib)
  .
  This package provides the shared library.
 
-Package: libqt5xdgiconloader2
+Package: libqt5xdgiconloader3
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -52,7 +52,7 @@ Package: libqt5xdg-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libqt5xdg2 (= ${binary:Version}),
+         libqt5xdg3 (= ${binary:Version}),
          libqt5xdgiconloader-dev (= ${binary:Version})
 Description: Development files for libqtxdg
  This library implements functions of the XDG Specifications in Qt. It is part
@@ -63,11 +63,21 @@ Description: Development files for libqtxdg
 Package: libqt5xdgiconloader-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          libqt5svg5-dev,
-         libqt5xdgiconloader2 (= ${binary:Version})
+         libqt5xdgiconloader3 (= ${binary:Version})
 Description: Development files for libqtxdgiconloader
  This library implements the backend to load icons which are handled according
  to the XDG Icon Theme Specification in Qt. It is part of LXQt.
  .
  This package provides development files.
+
+Package: qtxdg-dev-tools
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libqt5xdgiconloader3 (= ${binary:Version})
+Description: Development tools for libqtxdgiconloader
+ This package provide some development tools for qtxdg.

debian/copyright

@@ -3,22 +3,104 @@ Upstream-Name: libqtxdg
 Source: https://github.com/lxde/libqtxdg
 
 Files: *
-Copyright: 2012-2016 LXQt team
-           2010-2012 Razor team
+Copyright: 2012-2017, LXQt team
+           2010-2012, Razor team
 License: LGPL-2.1+
 
+Files: qtxdg/desktopenvironment_p.cpp
+       qtxdg/xdgdesktopfile_p.h
+       test/qtxdg_test.cpp
+       test/qtxdg_test.h
+       test/tst_xdgdirs.cpp
+       xdgiconloader/plugin/xdgiconengineplugin.cpp
+       xdgiconloader/plugin/xdgiconengineplugin.h
+Copyright: 2013-2017, LXQt team
+License: LGPL-2.1+
 
-Files: xdgiconloader/xdgiconloader_p.h
-       xdgiconloader/xdgiconloader.cpp
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3-with-Digia-1.1-exception
+Files: qtxdg/xdgmacros.h
+       qtxdg/xdgmimetype.cpp
+       qtxdg/xdgmimetype.h
+       test/tst_xdgdesktopfile.cpp
+       test/tst_xdgdesktopfile.h
+       util/qtxdg-desktop-file-start.cpp
+       util/qtxdg-iconfinder.cpp
+Copyright: 2014-2017, Luís Pereira <luis.artur.pereira@gmail.com>
+License: LGPL-2.1+
+
+Files: cmake/create_pkgconfig_file.cmake
+       cmake/create_portable_headers.cmake
+Copyright: 2015, Luís Pereira <luis.artur.pereira@gmail.com>
+License: BSD-3-clause
+
+Files: cmake/compiler_settings.cmake
+Copyright: 2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2015, Luís Pereira <luis.artur.pereira@gmail.com>
+License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2013-2017 Alf Gaida <agaida@siduction.org>
-	   2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+Copyright: 2013-2017, Alf Gaida <agaida@siduction.org>
+           2015, Andrew Lee (李健秋) <ajqlee@debian.org>
+           2014-2016, ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+
 
+Files: qtxdg/xdgaction.cpp
+       qtxdg/xdgaction.h
+       qtxdg/xdgautostart.cpp
+       qtxdg/xdgautostart.h
+       qtxdg/xdgdesktopfile.cpp
+       qtxdg/xdgdesktopfile.h
+       qtxdg/xdgdirs.cpp
+       qtxdg/xdgdirs.h
+       qtxdg/xdgicon.cpp
+       qtxdg/xdgicon.h
+       qtxdg/xdgmenu.cpp
+       qtxdg/xdgmenu.h
+       qtxdg/xdgmenu_p.h
+       qtxdg/xdgmenuapplinkprocessor.cpp
+       qtxdg/xdgmenuapplinkprocessor.h
+       qtxdg/xdgmenulayoutprocessor.cpp
+       qtxdg/xdgmenulayoutprocessor.h
+       qtxdg/xdgmenureader.cpp
+       qtxdg/xdgmenureader.h
+       qtxdg/xdgmenurules.cpp
+       qtxdg/xdgmenurules.h
+       qtxdg/xdgmenuwidget.cpp
+       qtxdg/xdgmenuwidget.h
+       qtxdg/xmlhelper.cpp
+       qtxdg/xmlhelper.h
+Copyright: 2010-2012, Razor team
+License: LGPL-2.1+
+
+Files: xdgiconloader/xdgiconloader.cpp
+       xdgiconloader/xdgiconloader_p.h
+Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3-with-Digia-1.1-exception
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: LGPL-2.1+
  This program or library is free software; you can redistribute it
  and/or modify it under the terms of the GNU Lesser General Public

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/experimental
 upstream-branch = upstream/latest
 pristine-tar = True
 

debian/libqt5xdg3.symbols

@@ -1,4 +1,4 @@
-libQt5Xdg.so.2 libqt5xdg2 #MINVER#
+libQt5Xdg.so.3 libqt5xdg3 #MINVER#
  (c++)"XdgAction::XdgAction(QObject*)@Base" 1.0.0
  (c++)"XdgAction::XdgAction(QString const&, QObject*)@Base" 1.0.0
  (c++)"XdgAction::XdgAction(XdgAction const&, QObject*)@Base" 1.0.0
@@ -20,6 +20,11 @@ libQt5Xdg.so.2 libqt5xdg2 #MINVER#
  (c++)"XdgDesktopFile::XdgDesktopFile()@Base" 1.0.0
  (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile const&)@Base" 1.0.0
  (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile::Type, QString const&, QString const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::actionActivate(QString const&, QStringList const&) const@Base" 3.1.0
+ (c++)"XdgDesktopFile::actionIcon(QString const&, QIcon const&) const@Base" 3.1.0
+ (c++)"XdgDesktopFile::actionIconName(QString const&) const@Base" 3.1.0
+ (c++)"XdgDesktopFile::actionName(QString const&) const@Base" 3.1.0
+ (c++)"XdgDesktopFile::actions() const@Base" 3.1.0
  (c++)"XdgDesktopFile::categories() const@Base" 1.2.0
  (c++)"XdgDesktopFile::contains(QString const&) const@Base" 1.0.0
  (c++)"XdgDesktopFile::expandExecString(QStringList const&) const@Base" 1.0.0
@@ -73,11 +78,11 @@ libQt5Xdg.so.2 libqt5xdg2 #MINVER#
  (c++)"XdgIcon::XdgIcon()@Base" 1.0.0
  (c++)"XdgIcon::defaultApplicationIcon()@Base" 1.0.0
  (c++)"XdgIcon::defaultApplicationIconName()@Base" 1.0.0
+ (c++)"XdgIcon::followColorScheme()@Base" 3.0.0
  (c++)"XdgIcon::fromTheme(QString const&, QIcon const&)@Base" 1.0.0
  (c++)"XdgIcon::fromTheme(QString const&, QString const&, QString const&, QString const&, QString const&)@Base" 1.0.0
  (c++)"XdgIcon::fromTheme(QStringList const&, QIcon const&)@Base" 1.0.0
- (c++)"XdgIcon::setThemeName(QString const&)@Base" 1.0.0
- (c++)"XdgIcon::themeName()@Base" 1.0.0
+ (c++)"XdgIcon::setFollowColorScheme(bool)@Base" 3.0.0
  (c++)"XdgIcon::~XdgIcon()@Base" 1.0.0
  (c++)"XdgMenu::XdgMenu(QObject*)@Base" 1.0.0
  (c++)"XdgMenu::addWatchPath(QString const&)@Base" 1.0.0
@@ -133,3 +138,4 @@ libQt5Xdg.so.2 libqt5xdg2 #MINVER#
  (c++)"vtable for XdgIcon@Base" 1.0.0
  (c++)"vtable for XdgMenu@Base" 1.0.0
  (c++)"vtable for XdgMenuWidget@Base" 1.0.0
+libQt5Xdg.so.3 libqt5xdg3 #MINVER#

debian/libqt5xdgiconloader-dev.install

@@ -3,6 +3,8 @@ usr/include/qt5xdgiconloader
 usr/lib/*/libQt5XdgIconLoader.so
 usr/lib/*/pkgconfig/Qt5XdgIconLoader.pc
 
+usr/lib/*/qt5/plugins/iconengines/libQt5XdgIconPlugin.so
+
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config-version.cmake
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config.cmake
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets.cmake

debian/libqt5xdgiconloader3.symbols

@@ -1,19 +1,15 @@
-libQt5XdgIconLoader.so.2 libqt5xdgiconloader2 #MINVER#
- (c++)"XdgIconLoader::XdgIconLoader()@Base" 2.0.0
- (c++)"XdgIconLoader::ensureInitialized()@Base" 2.0.0
- (c++)"XdgIconLoader::findIconHelper(QString const&, QString const&, QStringList&) const@Base" 2.0.0
+libQt5XdgIconLoader.so.3 libqt5xdgiconloader3 #MINVER#
+ (c++)"XdgIconLoader::findIconHelper(QString const&, QString const&, QStringList&, bool) const@Base" 3.0.0
  (c++)"XdgIconLoader::instance()@Base" 2.0.0
  (c++)"XdgIconLoader::loadIcon(QString const&) const@Base" 2.0.0
- (c++)"XdgIconLoader::setThemeName(QString const&)@Base" 2.0.0
- (c++)"XdgIconLoader::setThemeSearchPath(QStringList const&)@Base" 2.0.0
- (c++)"XdgIconLoader::themeSearchPaths() const@Base" 2.0.0
- (c++)"XdgIconLoader::updateSystemTheme()@Base" 2.0.0
+ (c++)"XdgIconLoader::setFollowColorScheme(bool)@Base" 3.0.0
+ (c++)"XdgIconLoader::unthemedFallback(QString const&, QStringList const&) const@Base" 3.0.0
  (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(QString const&)@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(XdgIconLoaderEngine const&)@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::actualSize(QSize const&, QIcon::Mode, QIcon::State)@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::clone() const@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::ensureLoaded()@Base" 2.0.0
- (c++)"XdgIconLoaderEngine::entryForSize(QSize const&)@Base" 2.0.0
+ (c++)"XdgIconLoaderEngine::entryForSize(QSize const&, int)@Base" 3.0.0
  (c++)"XdgIconLoaderEngine::hasIcon() const@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::key() const@Base" 2.0.0
  (c++)"XdgIconLoaderEngine::paint(QPainter*, QRect const&, QIcon::Mode, QIcon::State)@Base" 2.0.0

debian/qtxdg-dev-tools.install

@@ -0,0 +1,4 @@
+usr/bin/qtxdg-iconfinder
+usr/bin/qtxdg-desktop-file-start
+
+

debian/qtxdg-dev-tools.lintian-overrides

@@ -0,0 +1,5 @@
+# Yeah, we know
+
+qtxdg-dev-tools: binary-without-manpage usr/bin/qtxdg-desktop-file-start
+qtxdg-dev-tools: binary-without-manpage usr/bin/qtxdg-iconfinder
+

debian/rules

@@ -6,12 +6,13 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh ${@} --buildsystem cmake \
+	dh ${@} --buildsystem cmake
 
 override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		-DBUILD_DEV_UTILS=YES \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo